Bug 1952126 - build(rust): upgrade bitflags 2.7.0 → 2.9.0 r=supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D240569
This commit is contained in:
Erich Gubler
2025-03-11 03:08:43 +00:00
parent c6b748ad53
commit 7bd7e1835b
11 changed files with 135 additions and 83 deletions

76
Cargo.lock generated
View File

@@ -51,7 +51,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce34de545ad29bcc00cb1b87a94c132256dcf83aa7eeb9674482568405a6ff0a"
dependencies = [
"alsa-sys",
"bitflags 2.8.0",
"bitflags 2.9.0",
"libc",
"nix 0.26.99",
]
@@ -451,7 +451,7 @@ dependencies = [
name = "bindgen"
version = "0.69.4"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"cexpr",
"clang-sys",
"itertools",
@@ -484,14 +484,14 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
name = "bitflags"
version = "1.999.999"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
]
[[package]]
name = "bitflags"
version = "2.8.0"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
dependencies = [
"serde",
]
@@ -998,7 +998,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"core-foundation 0.10.0",
"libc",
]
@@ -1293,7 +1293,7 @@ source = "git+https://github.com/mozilla/cubeb-coreaudio-rs?rev=2407441a2f67341a
dependencies = [
"atomic",
"audio-mixer",
"bitflags 2.8.0",
"bitflags 2.9.0",
"coreaudio-sys-utils",
"cubeb-backend",
"float-cmp",
@@ -1623,7 +1623,7 @@ dependencies = [
name = "dom"
version = "0.1.0"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"malloc_size_of",
]
@@ -2705,7 +2705,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"gpu-alloc-types",
]
@@ -2715,7 +2715,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
]
[[package]]
@@ -2736,7 +2736,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"gpu-descriptor-types",
"hashbrown 0.14.5",
]
@@ -2747,7 +2747,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
]
[[package]]
@@ -3854,7 +3854,7 @@ version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"block",
"core-graphics-types 0.1.999",
"foreign-types",
@@ -3964,7 +3964,7 @@ version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5273687f49325b3977f7d372a1bbe2e528694d18128de8dcac78d134448e83b4"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"debugid",
"num-derive",
"num-traits",
@@ -3997,7 +3997,7 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e9370e1f326cb4385f78355d8a0f68f429e9002fd3ca53fff9b43fded234473"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"byteorder",
"cfg-if",
"crash-context",
@@ -4296,7 +4296,7 @@ dependencies = [
"allocator-api2",
"arrayvec",
"bindgen 0.69.4",
"bitflags 2.8.0",
"bitflags 2.9.0",
"byteorder",
"bytes",
"cc",
@@ -4486,7 +4486,7 @@ source = "git+https://github.com/gfx-rs/wgpu?rev=93f64dc847a0e6788b17b292ae4d7d5
dependencies = [
"arrayvec",
"bit-set",
"bitflags 2.8.0",
"bitflags 2.9.0",
"cfg_aliases",
"codespan-reporting",
"hashbrown 0.14.5",
@@ -4657,7 +4657,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"cfg-if",
"cfg_aliases",
"libc",
@@ -4713,7 +4713,7 @@ dependencies = [
name = "nsstring"
version = "0.1.0"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"encoding_rs",
]
@@ -4933,7 +4933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ec3b43050c38ffb9de87e17d874e9956e3a9131b343c9b7b7002597727c3891"
dependencies = [
"arrayvec",
"bitflags 2.8.0",
"bitflags 2.9.0",
"thiserror 1.999.999",
"zerocopy",
"zerocopy-derive",
@@ -5174,7 +5174,7 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"hex",
"serde",
]
@@ -5232,7 +5232,7 @@ name = "pulse"
version = "0.3.0"
source = "git+https://github.com/mozilla/cubeb-pulse-rs?rev=8678dcab1c287de79c4c184ccc2e065bc62b70e2#8678dcab1c287de79c4c184ccc2e065bc62b70e2"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"pulse-ffi",
]
@@ -5493,7 +5493,7 @@ checksum = "2c6d906922d99c677624d2042a93f89b2b7df0f6411032237d5d99a602c2487c"
dependencies = [
"arrayref",
"bincode",
"bitflags 2.8.0",
"bitflags 2.9.0",
"byteorder",
"id-arena",
"lazy_static",
@@ -5537,7 +5537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
dependencies = [
"base64 0.21.3",
"bitflags 2.8.0",
"bitflags 2.9.0",
"serde",
"serde_derive",
]
@@ -5580,7 +5580,7 @@ version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"fallible-iterator",
"fallible-streaming-iterator",
"hashlink",
@@ -5654,7 +5654,7 @@ version = "0.38.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"errno",
"libc",
"linux-raw-sys",
@@ -5739,7 +5739,7 @@ dependencies = [
name = "selectors"
version = "0.26.0"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"cssparser",
"derive_more 0.99.999",
"fxhash",
@@ -6007,7 +6007,7 @@ version = "0.3.0+sdk-1.3.268.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
]
[[package]]
@@ -6117,7 +6117,7 @@ dependencies = [
"arrayvec",
"atomic_refcell",
"bindgen 0.69.4",
"bitflags 2.8.0",
"bitflags 2.9.0",
"byteorder",
"cssparser",
"derive_more 0.99.999",
@@ -6181,7 +6181,7 @@ name = "style_traits"
version = "0.0.1"
dependencies = [
"app_units",
"bitflags 2.8.0",
"bitflags 2.9.0",
"cssparser",
"euclid",
"lazy_static",
@@ -7127,7 +7127,7 @@ version = "0.13.0+wasi-0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "652cd73449d0b957a2743b70c72d79d34a5fa505696488f4ca90b46f6da94118"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"wit-bindgen-rt",
]
@@ -7165,7 +7165,7 @@ version = "0.219.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c771866898879073c53b565a6c7b49953795159836714ac56a5befb581227c5"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"indexmap",
]
@@ -7237,7 +7237,7 @@ version = "0.62.0"
dependencies = [
"allocator-api2",
"bincode",
"bitflags 2.8.0",
"bitflags 2.9.0",
"build-parallel",
"byteorder",
"derive_more 0.99.999",
@@ -7274,7 +7274,7 @@ name = "webrender_api"
version = "0.62.0"
dependencies = [
"app_units",
"bitflags 2.8.0",
"bitflags 2.9.0",
"byteorder",
"crossbeam-channel",
"euclid",
@@ -7322,7 +7322,7 @@ dependencies = [
name = "webrender_build"
version = "0.0.2"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"lazy_static",
"serde",
]
@@ -7353,7 +7353,7 @@ source = "git+https://github.com/gfx-rs/wgpu?rev=93f64dc847a0e6788b17b292ae4d7d5
dependencies = [
"arrayvec",
"bit-vec",
"bitflags 2.8.0",
"bitflags 2.9.0",
"cfg_aliases",
"document-features",
"hashbrown 0.14.5",
@@ -7399,7 +7399,7 @@ dependencies = [
"arrayvec",
"ash",
"bit-set",
"bitflags 2.8.0",
"bitflags 2.9.0",
"block",
"cfg_aliases",
"core-graphics-types 0.1.999",
@@ -7430,7 +7430,7 @@ name = "wgpu-types"
version = "24.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=93f64dc847a0e6788b17b292ae4d7d59361e3be0#93f64dc847a0e6788b17b292ae4d7d59361e3be0"
dependencies = [
"bitflags 2.8.0",
"bitflags 2.9.0",
"js-sys",
"log",
"serde",

View File

@@ -1436,6 +1436,13 @@ delta = "2.6.0 -> 2.8.0"
notes = "No changes related to `unsafe impl ... bytemuck` pieces from `src/external.rs`."
aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT"
[[audits.google.audits.bitflags]]
who = "Daniel Cheng <dcheng@chromium.org>"
criteria = "safe-to-deploy"
delta = "2.8.0 -> 2.9.0"
notes = "Adds a straightforward clear() function, but no new unsafe code."
aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT"
[[audits.google.audits.bitreader]]
who = "George Burgess IV <gbiv@google.com>"
criteria = "safe-to-deploy"

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +1,12 @@
# 2.9.0
## What's Changed
* `Flags` trait: add `clear(&mut self)` method by @wysiwys in https://github.com/bitflags/bitflags/pull/437
* Fix up UI tests by @KodrAus in https://github.com/bitflags/bitflags/pull/438
**Full Changelog**: https://github.com/bitflags/bitflags/compare/2.8.0...2.9.0
# 2.8.0
## What's Changed

66
third_party/rust/bitflags/Cargo.lock generated vendored
View File

@@ -13,7 +13,7 @@ dependencies = [
[[package]]
name = "bitflags"
version = "2.8.0"
version = "2.9.0"
dependencies = [
"arbitrary",
"bytemuck",
@@ -50,9 +50,9 @@ dependencies = [
[[package]]
name = "compiler_builtins"
version = "0.1.142"
version = "0.1.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78013b42e2946a76d348a858fa5a06ca7d6b5cccdfccd660ea7a0aa4a44d40ca"
checksum = "5567db738d0fcdaaa007240b051c70aa7f0f08762e489ad1072298380eb3d84c"
[[package]]
name = "derive_arbitrary"
@@ -67,9 +67,9 @@ dependencies = [
[[package]]
name = "equivalent"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "glob"
@@ -85,9 +85,9 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
[[package]]
name = "indexmap"
version = "2.7.0"
version = "2.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
dependencies = [
"equivalent",
"hashbrown",
@@ -137,24 +137,24 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
[[package]]
name = "ryu"
version = "1.0.18"
version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
[[package]]
name = "serde"
version = "1.0.217"
version = "1.0.218"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.217"
version = "1.0.218"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
dependencies = [
"proc-macro2",
"quote",
@@ -163,9 +163,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.135"
version = "1.0.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
dependencies = [
"itoa",
"memchr",
@@ -193,9 +193,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.96"
version = "2.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
dependencies = [
"proc-macro2",
"quote",
@@ -204,9 +204,9 @@ dependencies = [
[[package]]
name = "target-triple"
version = "0.1.3"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078"
checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
[[package]]
name = "termcolor"
@@ -219,9 +219,9 @@ dependencies = [
[[package]]
name = "toml"
version = "0.8.19"
version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
dependencies = [
"serde",
"serde_spanned",
@@ -240,9 +240,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.22.22"
version = "0.22.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
dependencies = [
"indexmap",
"serde",
@@ -253,9 +253,9 @@ dependencies = [
[[package]]
name = "trybuild"
version = "1.0.101"
version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8dcd332a5496c026f1e14b7f3d2b7bd98e509660c04239c58b0ba38a12daded4"
checksum = "b812699e0c4f813b872b373a4471717d9eb550da14b311058a4d9cf4173cbca6"
dependencies = [
"glob",
"serde",
@@ -268,9 +268,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.14"
version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
[[package]]
name = "winapi-util"
@@ -356,27 +356,27 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
version = "0.6.24"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
dependencies = [
"memchr",
]
[[package]]
name = "zerocopy"
version = "0.8.14"
version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468"
checksum = "dcf01143b2dd5d134f11f545cf9f1431b13b749695cb33bcce051e7568f99478"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.14"
version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1"
checksum = "712c8386f4f4299382c9abee219bee7084f78fb939d88b6840fcc1320d5f6da2"
dependencies = [
"proc-macro2",
"quote",

View File

@@ -13,7 +13,7 @@
edition = "2021"
rust-version = "1.56.0"
name = "bitflags"
version = "2.8.0"
version = "2.9.0"
authors = ["The Rust Project Developers"]
build = false
exclude = [
@@ -44,6 +44,14 @@ repository = "https://github.com/bitflags/bitflags"
[package.metadata.docs.rs]
features = ["example_generated"]
[features]
example_generated = []
rustc-dep-of-std = [
"core",
"compiler_builtins",
]
std = []
[lib]
name = "bitflags"
path = "src/lib.rs"
@@ -120,11 +128,3 @@ version = "1.0.18"
[dev-dependencies.zerocopy]
version = "0.8"
features = ["derive"]
[features]
example_generated = []
rustc-dep-of-std = [
"core",
"compiler_builtins",
]
std = []

View File

@@ -28,7 +28,7 @@ Add this to your `Cargo.toml`:
```toml
[dependencies]
bitflags = "2.8.0"
bitflags = "2.9.0"
```
and this to your source code:

View File

@@ -17,7 +17,7 @@ Add `bitflags` to your `Cargo.toml`:
```toml
[dependencies.bitflags]
version = "2.8.0"
version = "2.9.0"
```
## Generating flags types

View File

@@ -1,6 +1,7 @@
mod all;
mod bitflags_match;
mod bits;
mod clear;
mod complement;
mod contains;
mod difference;

View File

@@ -0,0 +1,27 @@
use super::*;
use crate::Flags;
#[test]
fn cases() {
case(TestFlags::from_bits_retain(0));
case(TestFlags::from_bits_retain(1 << 3));
case(TestFlags::ABC | TestFlags::from_bits_retain(1 << 3));
case(TestZero::empty());
case(TestZero::all());
case(TestFlags::from_bits_retain(1 << 3) | TestFlags::all());
}
#[track_caller]
fn case<T: Flags + std::fmt::Debug>(mut flags: T)
where
T: std::fmt::Debug + PartialEq + Copy,
{
flags.clear();
assert_eq!(flags, T::empty(), "{:?}.clear()", flags);
}

View File

@@ -293,6 +293,14 @@ pub trait Flags: Sized + 'static {
}
}
/// Unsets all bits in the flags.
fn clear(&mut self)
where
Self: Sized,
{
*self = Self::empty();
}
/// The bitwise and (`&`) of the bits in two flags values.
#[must_use]
fn intersection(self, other: Self) -> Self {