diff --git a/Cargo.lock b/Cargo.lock index 28bb2eee..b08621ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -95,7 +95,7 @@ dependencies = [ "anyhow", "bindgen", "bitfield", - "bitflags 1.3.2", + "bitflags", "paste", "pkg-config", "uuid", @@ -107,7 +107,7 @@ version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cexpr", "clang-sys", "itertools", @@ -130,12 +130,6 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.6.0" @@ -480,7 +474,7 @@ version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno 0.3.9", "libc", "linux-raw-sys", diff --git a/bch_bindgen/Cargo.toml b/bch_bindgen/Cargo.toml index fa7851c6..aaf899fa 100644 --- a/bch_bindgen/Cargo.toml +++ b/bch_bindgen/Cargo.toml @@ -13,7 +13,7 @@ crate-type = ["lib"] anyhow = "1.0" uuid = "1.2.2" bitfield = "0.14.0" -bitflags = "1.3.2" +bitflags = "2" paste = "1.0.11" [build-dependencies] diff --git a/bch_bindgen/src/btree.rs b/bch_bindgen/src/btree.rs index 33791178..abc9e55b 100644 --- a/bch_bindgen/src/btree.rs +++ b/bch_bindgen/src/btree.rs @@ -71,7 +71,7 @@ impl<'t> BtreeIter<'t> { iter.as_mut_ptr(), btree, pos, - flags.bits as u32, + flags.bits().into(), ); BtreeIter { @@ -156,7 +156,7 @@ impl<'t> BtreeNodeIter<'t> { pos, locks_want, depth, - flags.bits as u32, + flags.bits().into(), ); BtreeNodeIter {