diff --git a/.deny.toml b/.deny.toml index ab15dc0d7..f307fd033 100644 --- a/.deny.toml +++ b/.deny.toml @@ -13,9 +13,15 @@ skip-tree = [ { name = "bit-set", version = "0.5.3" }, { name = "bit-vec", version = "0.6.3" }, { name = "capacity_builder", version = "0.1.3" }, - { name = "itertools", version = "0.10.5" }, ] skip = [ + # criterion uses an old version + { name = "itertools", version = "0.10.5" }, + # bindgen (used by deno) uses old version + { name = "itertools", version = "0.13.0" }, + # loom (used by tracy-client) uses old `matchers` crate + { name = "regex-automata", version = "0.1.10" }, + { name = "regex-syntax", version = "0.6.29" }, # Strum uses an old version { name = "heck", version = "0.4.0" }, # Deno uses an old version diff --git a/Cargo.lock b/Cargo.lock index 54c5045c7..5581d4688 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -483,10 +483,10 @@ dependencies = [ ] [[package]] -name = "byteorder" -version = "1.5.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" @@ -755,12 +755,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "colorchoice" version = "1.0.3" @@ -936,14 +930,20 @@ checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "ctor" -version = "0.2.9" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" +checksum = "07e9666f4a9a948d4f1dff0c08a4512b0f7c86414b23960104c243c10d79f4c3" dependencies = [ - "quote", - "syn", + "ctor-proc-macro", + "dtor", ] +[[package]] +name = "ctor-proc-macro" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d" + [[package]] name = "cts_runner" version = "25.0.0" @@ -1255,6 +1255,21 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" +[[package]] +name = "dtor" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222ef136a1c687d4aa0395c175f2c4586e379924c352fd02f7870cf7de783c23" +dependencies = [ + "dtor-proc-macro", +] + +[[package]] +name = "dtor-proc-macro" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055" + [[package]] name = "either" version = "1.15.0" @@ -2017,13 +2032,12 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "image" -version = "0.24.9" +version = "0.25.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a" dependencies = [ "bytemuck", - "byteorder", - "color_quant", + "byteorder-lite", "num-traits", "png", ] @@ -2075,6 +2089,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.15" @@ -2166,11 +2189,11 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "ktx2" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838" +checksum = "ff7f53bdf698e7aa7ec916411bbdc8078135da11b66db5182675b2227f6c0d07" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.9.0", ] [[package]] @@ -2203,7 +2226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -2418,7 +2441,7 @@ dependencies = [ "hexf-parse", "hlsl-snapshots", "indexmap", - "itertools 0.13.0", + "itertools 0.14.0", "log", "num-traits", "once_cell", @@ -2429,7 +2452,7 @@ dependencies = [ "rustc-hash", "serde", "spirv 0.3.0+sdk-1.3.268.0", - "strum 0.26.3", + "strum 0.27.1", "thiserror 2.0.12", "toml", "unicode-ident", @@ -3396,9 +3419,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "ron" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63f3aa105dea217ef30d89581b65a4d527a19afc95ef5750be3890e8d3c5b837" +checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f" dependencies = [ "base64", "bitflags 2.9.0", @@ -3814,11 +3837,11 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.3" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" dependencies = [ - "strum_macros 0.26.4", + "strum_macros 0.27.1", ] [[package]] @@ -3836,9 +3859,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -4115,9 +4138,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.17.6" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73202d787346a5418f8222eddb5a00f29ea47caf3c7d38a8f2f69f8455fa7c7e" +checksum = "d90a2c01305b02b76fdd89ac8608bae27e173c829a35f7d76a345ab5d33836db" dependencies = [ "loom", "once_cell", @@ -4131,7 +4154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fff37da548239c3bf9e64a12193d261e8b22b660991c6fd2df057c168f435f" dependencies = [ "cc", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -4815,7 +4838,7 @@ dependencies = [ "mach-dxcompiler-rs", "metal", "naga", - "ndk-sys 0.5.0+25.2.9519653", + "ndk-sys 0.6.0+11769913", "objc", "once_cell", "ordered-float", @@ -4878,7 +4901,7 @@ dependencies = [ "glam", "half", "image", - "itertools 0.13.0", + "itertools 0.14.0", "js-sys", "libtest-mimic", "log", @@ -4890,7 +4913,7 @@ dependencies = [ "profiling", "serde", "serde_json", - "strum 0.26.3", + "strum 0.27.1", "trybuild", "wasm-bindgen", "wasm-bindgen-futures", diff --git a/Cargo.toml b/Cargo.toml index 6d7da92e4..0d425aeea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,7 +98,7 @@ cfg_aliases = "0.2.1" cfg-if = "1" criterion = "0.5" codespan-reporting = { version = "0.12", default-features = false } -ctor = "0.2" +ctor = "0.4" document-features = "0.2.11" encase = "0.10.0" env_logger = "0.11" @@ -112,10 +112,10 @@ hashbrown = { version = "0.15.2", default-features = false, features = [ "inline-more", ] } heck = "0.5.0" -image = { version = "0.24", default-features = false, features = ["png"] } +image = { version = "0.25", default-features = false, features = ["png"] } indexmap = { version = "2.7.1", default-features = false } -itertools = { version = "0.13.0" } -ktx2 = "0.3" +itertools = { version = "0.14.0" } +ktx2 = "0.4" libc = { version = "0.2", default-features = false } libloading = "0.8" libtest-mimic = "0.8.1" @@ -141,7 +141,7 @@ profiling = { version = "1", default-features = false } raw-window-handle = { version = "0.6.2", default-features = false } rayon = "1" renderdoc-sys = "1.1.0" -ron = "0.9" +ron = "0.10" # NOTE: rustc-hash v2 is a completely different hasher with different performance characteristics # see discussion here (including with some other alternatives): https://github.com/gfx-rs/wgpu/issues/6999 # (using default-features = false to support no-std build, avoiding any extra features that may require std::collections) @@ -150,9 +150,9 @@ serde_json = "1.0.140" serde = { version = "1", default-features = false } smallvec = "1" static_assertions = "1.1.0" -strum = { version = "0.26.3", default-features = false, features = ["derive"] } +strum = { version = "0.27.1", default-features = false, features = ["derive"] } trybuild = "1" -tracy-client = "0.17" +tracy-client = "0.18" thiserror = { version = "2", default-features = false } walkdir = "2" winit = { version = "0.29", features = ["android-native-activity"] } @@ -208,7 +208,7 @@ tokio = "1.44.2" termcolor = "1.4.1" # android dependencies -ndk-sys = "0.5.0" +ndk-sys = "0.6.0" # These overrides allow our examples to explicitly depend on release crates [patch.crates-io] diff --git a/examples/features/src/skybox/mod.rs b/examples/features/src/skybox/mod.rs index 4d3347de6..f10042ee1 100644 --- a/examples/features/src/skybox/mod.rs +++ b/examples/features/src/skybox/mod.rs @@ -322,7 +322,7 @@ impl crate::framework::Example for Example { let mut image = Vec::with_capacity(reader.data().len()); for level in reader.levels() { - image.extend_from_slice(level); + image.extend_from_slice(level.data); } let texture = device.create_texture_with_data( diff --git a/tests/src/lib.rs b/tests/src/lib.rs index 0967817a4..9bc890c75 100644 --- a/tests/src/lib.rs +++ b/tests/src/lib.rs @@ -19,7 +19,7 @@ pub use init::initialize_html_canvas; pub use self::image::ComparisonType; pub use config::GpuTestConfiguration; #[doc(hidden)] -pub use ctor::ctor; +pub use ctor; pub use expectations::{FailureApplicationReasons, FailureBehavior, FailureCase, FailureReason}; pub use init::{initialize_adapter, initialize_device, initialize_instance}; pub use params::TestParameters; diff --git a/wgpu-macros/src/lib.rs b/wgpu-macros/src/lib.rs index f8232c036..ffda34610 100644 --- a/wgpu-macros/src/lib.rs +++ b/wgpu-macros/src/lib.rs @@ -19,7 +19,7 @@ pub fn gpu_test(_attr: TokenStream, item: TokenStream) -> TokenStream { quote! { #[cfg(not(target_arch = "wasm32"))] - #[::wgpu_test::ctor] + #[::wgpu_test::ctor::ctor(crate_path = ::wgpu_test::ctor)] fn #register_test_name() { struct S;