diff --git a/Cargo.lock b/Cargo.lock index e036d88a..2380cda7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -427,9 +427,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -437,33 +437,33 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "deku" version = "0.16.0" -source = "git+https://github.com/sharksforarms/deku?branch=impl-writer#a9df540c10fefa34387eeddafbdc62d2ba5dd036" +source = "git+https://github.com/sharksforarms/deku?branch=impl-writer-inline-read-bytes#dbb3849287ddb82ec48092c32a945fd4dca37016" dependencies = [ "bitvec", "deku_derive", @@ -473,13 +473,13 @@ dependencies = [ [[package]] name = "deku_derive" version = "0.16.0" -source = "git+https://github.com/sharksforarms/deku?branch=impl-writer#a9df540c10fefa34387eeddafbdc62d2ba5dd036" +source = "git+https://github.com/sharksforarms/deku?branch=impl-writer-inline-read-bytes#dbb3849287ddb82ec48092c32a945fd4dca37016" dependencies = [ "darling", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] diff --git a/backhand/Cargo.toml b/backhand/Cargo.toml index b7446eb7..05b51269 100644 --- a/backhand/Cargo.toml +++ b/backhand/Cargo.toml @@ -13,7 +13,7 @@ readme = "../README.md" [dependencies] tracing = { version = "0.1.40", features = ["release_max_level_off"] } -deku = { git = "https://github.com/sharksforarms/deku", branch = "impl-writer" } +deku = { git = "https://github.com/sharksforarms/deku", branch = "impl-writer-inline-read-bytes" } thiserror = "1.0.56" flate2 = { version = "1.0.28", optional = true } zune-inflate = { version = "0.2.54", optional = true, default-features = false, features = ["zlib"] } diff --git a/backhand/src/compressor.rs b/backhand/src/compressor.rs index 921cf6f5..277f626a 100644 --- a/backhand/src/compressor.rs +++ b/backhand/src/compressor.rs @@ -17,7 +17,7 @@ use crate::filesystem::writer::{CompressionExtra, FilesystemCompressor}; #[derive(Copy, Clone, Debug, PartialEq, Eq, DekuRead, DekuWrite, Default)] #[deku(endian = "endian", ctx = "endian: deku::ctx::Endian")] -#[deku(type = "u16")] +#[deku(id_type = "u16")] #[rustfmt::skip] pub enum Compressor { None = 0, diff --git a/backhand/src/inode.rs b/backhand/src/inode.rs index 6e7987ce..34108265 100644 --- a/backhand/src/inode.rs +++ b/backhand/src/inode.rs @@ -63,7 +63,7 @@ impl Inode { } #[derive(Debug, DekuRead, DekuWrite, Clone, Copy, PartialEq, Eq)] -#[deku(type = "u16")] +#[deku(id_type = "u16")] #[deku(endian = "endian", ctx = "endian: deku::ctx::Endian")] #[rustfmt::skip] pub enum InodeId { diff --git a/backhand/src/metadata.rs b/backhand/src/metadata.rs index 761f70e7..5b7256f7 100644 --- a/backhand/src/metadata.rs +++ b/backhand/src/metadata.rs @@ -1,5 +1,5 @@ use std::collections::VecDeque; -use std::io::{self, Cursor, Read, Seek, Write}; +use std::io::{self, Read, Seek, Write}; use deku::prelude::*; use tracing::trace;