diff --git a/rust-src/bch_bindgen/Cargo.lock b/rust-src/bch_bindgen/Cargo.lock index ad67f8e2..0084865f 100644 --- a/rust-src/bch_bindgen/Cargo.lock +++ b/rust-src/bch_bindgen/Cargo.lock @@ -34,9 +34,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" dependencies = [ "bitflags", "cexpr", @@ -49,6 +49,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn", ] [[package]] diff --git a/rust-src/bch_bindgen/Cargo.toml b/rust-src/bch_bindgen/Cargo.toml index 91cc77fe..37a56273 100644 --- a/rust-src/bch_bindgen/Cargo.toml +++ b/rust-src/bch_bindgen/Cargo.toml @@ -23,4 +23,4 @@ gag = "1.0.0" [build-dependencies] pkg-config = "0.3" -bindgen = { version = "0.59.1", default-features = false } +bindgen = { version = "0.63", default-features = false } diff --git a/rust-src/bch_bindgen/build.rs b/rust-src/bch_bindgen/build.rs index fd570dbb..e729bcab 100644 --- a/rust-src/bch_bindgen/build.rs +++ b/rust-src/bch_bindgen/build.rs @@ -1,6 +1,5 @@ fn main() { use std::path::PathBuf; - // use std::process::Command; let out_dir: PathBuf = std::env::var_os("OUT_DIR").expect("ENV Var 'OUT_DIR' Expected").into(); let top_dir: PathBuf = std::env::var_os("CARGO_MANIFEST_DIR") @@ -28,11 +27,6 @@ fn main() { .layout_tests(true) .default_enum_style(bindgen::EnumVariation::Rust { non_exhaustive: true }) .allowlist_function(".*bch2_.*") - // .allowlist_function("bch2_read_super") - // .allowlist_function("bch2_sb_field_.*") - // .allowlist_function("bch2_super_write") - // .allowlist_function("bch2_chacha_encrypt_key") - // .allowlist_function("__bch2_super_read") .allowlist_function("bio_.*") .allowlist_function("bch2_super_write_fd") .allowlist_function("derive_passphrase") @@ -53,8 +47,7 @@ fn main() { .newtype_enum("bch_kdf_types") .opaque_type("gendisk") .opaque_type("bkey") - // .opaque_type("bch_extent_ptr") - // .opaque_type("bch_extent_crc32") + .opaque_type("gc_stripe") .opaque_type("open_bucket.*") .generate() .expect("BindGen Generation Failiure: [libbcachefs_wrapper]"); diff --git a/rust-src/bch_bindgen/src/bcachefs.rs b/rust-src/bch_bindgen/src/bcachefs.rs index cc98ffc1..6e36790a 100644 --- a/rust-src/bch_bindgen/src/bcachefs.rs +++ b/rust-src/bch_bindgen/src/bcachefs.rs @@ -40,21 +40,6 @@ impl PartialEq for bch_sb { } } -impl std::fmt::Debug for bch_sb { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.debug_struct("bch_sb") - .field("uuid", &self.uuid()) - .field("version", &(self.version, self.version_min)) - .field("block_size", &self.block_size) - .field("device_idx", &self.dev_idx) - .field("seq", &self.seq) - .field("csum", &(self.csum.lo, self.csum.hi)) - .field("offset", &self.offset) - .finish_non_exhaustive() - } -} - - impl bch_sb { pub fn crypt(&self) -> Option<&bch_sb_field_crypt> { unsafe { diff --git a/rust-src/mount/Cargo.lock b/rust-src/mount/Cargo.lock index 08e5a628..dd00c57a 100644 --- a/rust-src/mount/Cargo.lock +++ b/rust-src/mount/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" dependencies = [ "bitflags", "cexpr", @@ -113,6 +113,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn", ] [[package]] @@ -147,9 +148,9 @@ checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" [[package]] name = "cc" -version = "1.0.76" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cexpr" @@ -690,9 +691,9 @@ checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" [[package]] name = "serde_json" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", diff --git a/rust-src/mount/src/key.rs b/rust-src/mount/src/key.rs index 91c92d1c..5e64da54 100644 --- a/rust-src/mount/src/key.rs +++ b/rust-src/mount/src/key.rs @@ -57,7 +57,7 @@ fn ask_for_key(fs: &FileSystem) -> anyhow::Result<()> { &mut output as *mut _, fs.sb().sb().nonce(), &mut key as *mut _ as *mut _, - std::mem::size_of::() as u64, + std::mem::size_of::() as usize, ) }; if ret != 0 { @@ -71,7 +71,7 @@ fn ask_for_key(fs: &FileSystem) -> anyhow::Result<()> { key_type, key_name.as_c_str().to_bytes_with_nul() as *const _ as *const c_char, &output as *const _ as *const _, - std::mem::size_of::() as u64, + std::mem::size_of::() as usize, bch_bindgen::keyutils::KEY_SPEC_USER_KEYRING, ) };