diff --git a/Cargo.lock b/Cargo.lock index 4995ce52..f78d2221 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,12 +65,6 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - [[package]] name = "bcachefs-tools" version = "1.12.0" @@ -103,7 +97,6 @@ dependencies = [ "bitfield", "bitflags 1.3.2", "byteorder", - "memoffset", "paste", "pkg-config", "uuid", @@ -379,15 +372,6 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "minimal-lexical" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index f2b93756..4d170300 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "bcachefs-tools" version = "1.12.0" authors = ["Yuxuan Shui ", "Kayla Firestack ", "Kent Overstreet " ] edition = "2021" -rust-version = "1.70" +rust-version = "1.77" [[bin]] name = "bcachefs" diff --git a/bch_bindgen/Cargo.toml b/bch_bindgen/Cargo.toml index 63be4f3d..c46e275b 100644 --- a/bch_bindgen/Cargo.toml +++ b/bch_bindgen/Cargo.toml @@ -3,6 +3,7 @@ name = "bch_bindgen" version = "0.1.0" authors = [ "Kayla Firestack ", "Yuxuan Shui ", "Kent Overstreet " ] edition = "2021" +rust-version = "1.77" [lib] crate-type = ["lib"] @@ -12,7 +13,6 @@ crate-type = ["lib"] anyhow = "1.0" uuid = "1.2.2" bitfield = "0.14.0" -memoffset = "0.8.0" byteorder = "1.3" bitflags = "1.3.2" paste = "1.0.11" diff --git a/bch_bindgen/src/bcachefs.rs b/bch_bindgen/src/bcachefs.rs index 366c7332..f30f6e12 100644 --- a/bch_bindgen/src/bcachefs.rs +++ b/bch_bindgen/src/bcachefs.rs @@ -18,7 +18,7 @@ bitfield! { pub struct bch_crypt_flags(u64); pub TYPE, _: 4, 0; } -use memoffset::offset_of; +use std::mem::offset_of; impl bch_sb_field_crypt { pub fn scrypt_flags(&self) -> Option { use std::convert::TryInto;