Update to bitflags 2

bch_bindgen -> bindgen already requires bitflags 2,
so this can eliminate a duplicate dependency.
This commit is contained in:
Gabriel 2024-09-02 22:14:39 +00:00 committed by Gabriel de Perthuis
parent 086fb7f313
commit 2e0e491459
3 changed files with 6 additions and 12 deletions

12
Cargo.lock generated
View File

@ -95,7 +95,7 @@ dependencies = [
"anyhow", "anyhow",
"bindgen", "bindgen",
"bitfield", "bitfield",
"bitflags 1.3.2", "bitflags",
"paste", "paste",
"pkg-config", "pkg-config",
"uuid", "uuid",
@ -107,7 +107,7 @@ version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools", "itertools",
@ -130,12 +130,6 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "2.6.0" version = "2.6.0"
@ -480,7 +474,7 @@ version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags",
"errno 0.3.9", "errno 0.3.9",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",

View File

@ -13,7 +13,7 @@ crate-type = ["lib"]
anyhow = "1.0" anyhow = "1.0"
uuid = "1.2.2" uuid = "1.2.2"
bitfield = "0.14.0" bitfield = "0.14.0"
bitflags = "1.3.2" bitflags = "2"
paste = "1.0.11" paste = "1.0.11"
[build-dependencies] [build-dependencies]

View File

@ -71,7 +71,7 @@ impl<'t> BtreeIter<'t> {
iter.as_mut_ptr(), iter.as_mut_ptr(),
btree, btree,
pos, pos,
flags.bits as u32, flags.bits().into(),
); );
BtreeIter { BtreeIter {
@ -156,7 +156,7 @@ impl<'t> BtreeNodeIter<'t> {
pos, pos,
locks_want, locks_want,
depth, depth,
flags.bits as u32, flags.bits().into(),
); );
BtreeNodeIter { BtreeNodeIter {