From 817b30da35fd44c37733c8b5da250de334e6bcdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 23:40:11 +0000 Subject: [PATCH] build(deps): bump binrw from 0.9.2 to 0.10.0 Bumps [binrw](https://github.com/jam1garner/binrw) from 0.9.2 to 0.10.0. - [Release notes](https://github.com/jam1garner/binrw/releases) - [Commits](https://github.com/jam1garner/binrw/compare/v0.9.2...v0.10.0) --- updated-dependencies: - dependency-name: binrw dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 16 ++++++++++++---- Cargo.toml | 2 +- src/blob/packer.rs | 14 +++++++------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c88d37e..30bc56b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,20 +135,22 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "binrw" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abb4fd60add897b9e8827e0d5fa6c2ca129ece2432d9aa13454b21ac2ecc18f" +checksum = "f846d8732b2a55b569b885852ecc925a2b1f24568f4707f8b1ccd5dc6805ea9b" dependencies = [ "array-init", "binrw_derive", + "bytemuck", ] [[package]] name = "binrw_derive" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36ff195a3a1a82d5eeb98e0069bdf3ea076042d28591396d9020fac763bf66f" +checksum = "5c2aa66a5e35daf7f91ed44c945886597ef4c327f34f68b6bbf22951a250ceeb" dependencies = [ + "either", "owo-colors", "proc-macro2", "quote", @@ -185,6 +187,12 @@ version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +[[package]] +name = "bytemuck" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" + [[package]] name = "bytes" version = "1.2.1" diff --git a/Cargo.toml b/Cargo.toml index ac1c3c4..b80106c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ cdc = "0.1" integer-sqrt = "0.1" # serialization base64 = "0.13" -binrw = "0.9" +binrw = "0.10" hex = { version = "0.4", features = ["serde"] } serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/src/blob/packer.rs b/src/blob/packer.rs index 49d1d47..a74bda1 100644 --- a/src/blob/packer.rs +++ b/src/blob/packer.rs @@ -203,22 +203,22 @@ impl Packer { /// writes header and length of header to packfile pub async fn write_header(&mut self) -> Result<()> { #[derive(BinWrite)] - struct PackHeaderLength(#[bw(little)] u32); + #[bw(little)] + struct PackHeaderLength(u32); #[derive(BinWrite)] + #[bw(little)] struct PackHeaderEntry { tpe: u8, - #[bw(little)] len: u32, id: Id, } #[derive(BinWrite)] + #[bw(little)] struct PackHeaderEntryComp { tpe: u8, - #[bw(little)] len: u32, - #[bw(little)] len_data: u32, id: Id, } @@ -235,7 +235,7 @@ impl Packer { len: blob.length, id: blob.id, } - .write_to(&mut writer)?, + .write(&mut writer)?, Some(len) => PackHeaderEntryComp { tpe: match blob.tpe { BlobType::Data => 0b10, @@ -245,7 +245,7 @@ impl Packer { len_data: len.get(), id: blob.id, } - .write_to(&mut writer)?, + .write(&mut writer)?, }; } @@ -261,7 +261,7 @@ impl Packer { // finally write length of header unencrypted to pack file let mut writer = Cursor::new(Vec::new()); - PackHeaderLength(headerlen.try_into()?).write_to(&mut writer)?; + PackHeaderLength(headerlen.try_into()?).write(&mut writer)?; let data = writer.into_inner(); self.write_data(&data).await?;