diff --git a/src/models/data.rs b/src/models/data.rs index 9e94e9a..fe3533c 100644 --- a/src/models/data.rs +++ b/src/models/data.rs @@ -63,8 +63,7 @@ fn assert_magic + PartialEq>(actual: T, expected: T) -> Result { #[inline] fn read_length_delimited(reader: &mut impl Read) -> Result> { let length = reader.read_u8()? as usize; - let mut buffer = Vec::new(); - buffer.resize(length, 0); + let mut buffer = vec![0; length]; reader.read_exact(&mut buffer)?; Ok(buffer) } @@ -76,8 +75,7 @@ fn read_string(reader: &mut impl Read) -> Result { #[inline] fn read_pickled(reader: &mut impl Read, length: usize) -> Result { - let mut buffer = Vec::new(); - buffer.resize(length, 0); + let mut buffer = vec![0; length]; reader.read_exact(&mut buffer)?; Ok(serde_pickle::from_slice(&buffer, Default::default())?) } diff --git a/src/models/data/base_player_create.rs b/src/models/data/base_player_create.rs index 88e6c2b..a9dad01 100644 --- a/src/models/data/base_player_create.rs +++ b/src/models/data/base_player_create.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] pub struct BasePlayerCreate { #[serde(default, rename(deserialize = "playersBattleCategoriesIds"))] - pub players_battle_categories_ids: Option>, + pub players_battle_categories_ids: Option>, #[serde(rename(deserialize = "battleLevel"))] pub battle_level: u8, @@ -34,10 +34,10 @@ pub struct BasePlayerCreate { pub average_mm_ratings: Option>>, #[serde(default, rename(deserialize = "playerWaitTimes"))] - pub player_wait_times: Option>, + pub player_wait_times: Option>, #[serde(rename(deserialize = "accountDatabaseIds"))] - pub account_database_ids: Option>, + pub account_database_ids: Option>, #[serde(default, rename(deserialize = "turboBattlesStats"))] pub turbo_battles_statistics: Option, diff --git a/src/models/data/packet.rs b/src/models/data/packet.rs index 98f402f..0f06659 100644 --- a/src/models/data/packet.rs +++ b/src/models/data/packet.rs @@ -35,7 +35,9 @@ impl Packet { /// /// Parsed packet, or [`None`], when no packets are left. pub fn from_reader(reader: &mut impl Read) -> Result> { - let Ok(length) = reader.read_u32::() else { return Ok(None) }; + let Ok(length) = reader.read_u32::() else { + return Ok(None); + }; let type_ = reader.read_u32::()?; let clock_secs = reader.read_f32::()?; let raw_payload = Self::read_raw_payload(reader, length as usize)?; @@ -57,8 +59,7 @@ impl Packet { } fn read_raw_payload(reader: &mut impl Read, length: usize) -> Result> { - let mut buffer = Vec::new(); - buffer.resize(length, 0); + let mut buffer = vec![0; length]; reader.read_exact(&mut buffer)?; Ok(buffer) }