From cf4a74c6b909dc7062ba38a9a27a5421d983e6a7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:24:26 +0000 Subject: [PATCH] chore(deps): update deps and deny file --- .deny.toml | 6 +- Cargo.lock | 156 +++++++++++++++++------ Cargo.toml | 8 +- benches/Cargo.toml | 2 +- benches/benches/wgpu-benchmark/shader.rs | 14 +- naga-cli/Cargo.toml | 2 +- naga-cli/src/bin/naga.rs | 6 +- 7 files changed, 143 insertions(+), 51 deletions(-) diff --git a/.deny.toml b/.deny.toml index 4e690a0ce..80fc40130 100644 --- a/.deny.toml +++ b/.deny.toml @@ -29,7 +29,8 @@ skip = [ { name = "windows-result", version = "0.3.4" }, { name = "windows-strings", version = "0.4.2" }, - # cargo-metadata uses an old version of ordered-float. Only used for testing. + # cargo-metadata uses old version. Only used for infrastructure. + { name = "toml", version = "0.8.23" }, { name = "ordered-float", version = "2.10.1" }, # criterion uses an old version { name = "itertools", version = "0.10.5" }, @@ -41,6 +42,7 @@ skip = [ # Strum uses an old version { name = "heck", version = "0.4.0" }, # Deno uses an old version + { name = "bincode", version = "1.3.3" }, { name = "strum", version = "0.25.0" }, ] wildcards = "deny" @@ -70,7 +72,7 @@ private = { ignore = true } [sources] allow-git = [ - # Waiting on releases; used in examples only + # Waiting on releases; used in examples/tests only ] unknown-registry = "deny" unknown-git = "deny" diff --git a/Cargo.lock b/Cargo.lock index 64c090b97..c712af7b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,6 +344,26 @@ dependencies = [ "serde", ] +[[package]] +name = "bincode" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" +dependencies = [ + "bincode_derive", + "serde", + "unty", +] + +[[package]] +name = "bincode_derive" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" +dependencies = [ + "virtue", +] + [[package]] name = "bindgen" version = "0.70.1" @@ -595,25 +615,25 @@ dependencies = [ [[package]] name = "cargo-util-schemas" -version = "0.2.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca" +checksum = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830" dependencies = [ "semver 1.0.26", "serde", "serde-untagged", "serde-value", - "thiserror 1.0.69", - "toml", + "thiserror 2.0.12", + "toml 0.8.23", "unicode-xid", "url", ] [[package]] name = "cargo_metadata" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502" +checksum = "5cfca2aaa699835ba88faf58a06342a314a950d2b9686165e038286c30316868" dependencies = [ "camino", "cargo-platform", @@ -723,9 +743,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.40" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" +checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" dependencies = [ "clap_builder", "clap_derive", @@ -733,9 +753,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.40" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" +checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" dependencies = [ "anstream", "anstyle", @@ -745,9 +765,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.40" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" +checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -905,9 +925,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -1046,7 +1066,7 @@ checksum = "113f3f08bd5daf99f1a7876c0f99cd8c3c609439fa0b808311ec856a253e95f0" dependencies = [ "anyhow", "az", - "bincode", + "bincode 1.3.3", "bit-set 0.5.3", "bit-vec 0.6.3", "bytes", @@ -2399,9 +2419,9 @@ checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "memmap2" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28" dependencies = [ "libc", ] @@ -2508,7 +2528,7 @@ dependencies = [ "spirv", "strum 0.27.1", "thiserror 2.0.12", - "toml", + "toml 0.9.2", "unicode-ident", "walkdir", ] @@ -2519,7 +2539,7 @@ version = "26.0.0" dependencies = [ "anyhow", "argh", - "bincode", + "bincode 2.0.1", "codespan-reporting", "env_logger", "log", @@ -3238,7 +3258,7 @@ dependencies = [ "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 1.0.7", + "rustix 1.0.8", "tracing", "windows-sys 0.59.0", ] @@ -3599,15 +3619,15 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" dependencies = [ "bitflags 2.9.1", "errno", "libc", "linux-raw-sys 0.9.4", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -3756,6 +3776,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" +dependencies = [ + "serde", +] + [[package]] name = "serde_v8" version = "0.247.0" @@ -4041,9 +4070,9 @@ dependencies = [ [[package]] name = "sys_traits" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4707edf3196e8037ee45018d1bb1bfb233b0e4fc440fa3d3f25bc69bfdaf26" +checksum = "4f74a2c95f72e36fa6bd04a40d15623a9904bab1cc2fa6c6135b09d774a65088" dependencies = [ "sys_traits_macros", ] @@ -4222,11 +4251,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", "toml_edit", ] +[[package]] +name = "toml" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac" +dependencies = [ + "indexmap", + "serde", + "serde_spanned 1.0.0", + "toml_datetime 0.7.0", + "toml_parser", + "toml_writer", + "winnow", +] + [[package]] name = "toml_datetime" version = "0.6.11" @@ -4236,6 +4280,15 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" +dependencies = [ + "serde", +] + [[package]] name = "toml_edit" version = "0.22.27" @@ -4244,18 +4297,33 @@ checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ "indexmap", "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", "toml_write", "winnow", ] +[[package]] +name = "toml_parser" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30" +dependencies = [ + "winnow", +] + [[package]] name = "toml_write" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" +[[package]] +name = "toml_writer" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" + [[package]] name = "tracing" version = "0.1.41" @@ -4328,9 +4396,9 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c9bf9513a2f4aeef5fdac8677d7d349c79fdbcc03b9c86da6e9d254f1e43be2" +checksum = "65af40ad689f2527aebbd37a0a816aea88ff5f774ceabe99de5be02f2f91dae2" dependencies = [ "glob", "serde", @@ -4338,7 +4406,7 @@ dependencies = [ "serde_json", "target-triple", "termcolor", - "toml", + "toml 0.9.2", ] [[package]] @@ -4430,6 +4498,12 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817" +[[package]] +name = "unty" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" + [[package]] name = "url" version = "2.5.4" @@ -4507,6 +4581,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "virtue" +version = "0.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" + [[package]] name = "vsimd" version = "0.8.0" @@ -4852,7 +4932,7 @@ dependencies = [ name = "wgpu-benchmark" version = "26.0.0" dependencies = [ - "bincode", + "bincode 2.0.1", "bytemuck", "criterion", "naga", @@ -5147,7 +5227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d" dependencies = [ "env_home", - "rustix 1.0.7", + "rustix 1.0.8", "winsafe", ] @@ -5747,9 +5827,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" dependencies = [ "memchr", ] @@ -5843,9 +5923,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda" +checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7" [[package]] name = "xshell" diff --git a/Cargo.toml b/Cargo.toml index 444bb9aa7..e8af139f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,7 +95,7 @@ approx = "0.5" arbitrary = "1.4" argh = "0.1.13" arrayvec = { version = "0.7.1", default-features = false } -bincode = "1" +bincode = "2" bit-set = { version = "0.8", default-features = false } bit-vec = { version = "0.8", default-features = false } bitflags = "2.9" @@ -103,7 +103,7 @@ bytemuck = { version = "1.22", features = [ "extern_crate_alloc", "min_const_generics", ] } -cargo_metadata = "0.20" +cargo_metadata = "0.21" cfg_aliases = "0.2.1" cfg-if = "1" criterion = "0.6" @@ -183,10 +183,10 @@ spirv = "0.3" static_assertions = "1.1" strum = { version = "0.27", default-features = false, features = ["derive"] } syn = "2.0.98" -toml = "0.8.9" +toml = "0.9.0" trybuild = "1" tracy-client = "0.18" -thiserror = { version = "2.0.3", default-features = false } +thiserror = { version = "2.0.11", default-features = false } unicode-ident = "1.0.5" walkdir = "2.3" winit = { version = "0.29", features = ["android-native-activity"] } diff --git a/benches/Cargo.toml b/benches/Cargo.toml index f0b70229a..9af4cf4ae 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -26,7 +26,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [ ] } [dependencies] -bincode.workspace = true +bincode = { workspace = true, features = ["serde"] } bytemuck.workspace = true criterion.workspace = true naga = { workspace = true, features = [ diff --git a/benches/benches/wgpu-benchmark/shader.rs b/benches/benches/wgpu-benchmark/shader.rs index d54c566fa..b98cef01a 100644 --- a/benches/benches/wgpu-benchmark/shader.rs +++ b/benches/benches/wgpu-benchmark/shader.rs @@ -152,12 +152,22 @@ fn frontends(c: &mut Criterion) { let inputs_bin = inputs_wgsl .inner .iter() - .map(|input| bincode::serialize(&input.module.as_ref().unwrap()).unwrap()) + .map(|input| { + bincode::serde::encode_to_vec( + input.module.as_ref().unwrap(), + bincode::config::standard(), + ) + .unwrap() + }) .collect::>(); b.iter(move || { for input in inputs_bin.iter() { - bincode::deserialize::(input).unwrap(); + bincode::serde::decode_from_slice::( + input, + bincode::config::standard(), + ) + .unwrap(); } }); }); diff --git a/naga-cli/Cargo.toml b/naga-cli/Cargo.toml index 16e78631f..e1e708ddf 100644 --- a/naga-cli/Cargo.toml +++ b/naga-cli/Cargo.toml @@ -41,7 +41,7 @@ naga = { workspace = true, features = [ "fs", ] } -bincode.workspace = true +bincode = { workspace = true, features = ["serde"] } codespan-reporting = { workspace = true, default-features = false, features = [ "std", "termcolor", diff --git a/naga-cli/src/bin/naga.rs b/naga-cli/src/bin/naga.rs index c32d52a83..591ea0d9d 100644 --- a/naga-cli/src/bin/naga.rs +++ b/naga-cli/src/bin/naga.rs @@ -643,7 +643,7 @@ fn parse_input(input_path: &Path, input: Vec, params: &Parameters) -> anyhow Ok(match input_kind { InputKind::Bincode => Parsed { - module: bincode::deserialize(&input)?, + module: bincode::serde::decode_from_slice(&input, bincode::config::standard())?.0, input_text: None, language: naga::back::spv::SourceLanguage::Unknown, }, @@ -747,8 +747,8 @@ fn write_output( } } "bin" => { - let file = fs::File::create(output_path)?; - bincode::serialize_into(file, module)?; + let mut file = fs::File::create(output_path)?; + bincode::serde::encode_into_std_write(module, &mut file, bincode::config::standard())?; } "metal" => { use naga::back::msl;