Skip to content

Commit cfb46d6

Browse files
cwfitzgeraldErichDonGubler
authored andcommitted
Update missed dependencies
1 parent ca00c61 commit cfb46d6

File tree

6 files changed

+77
-48
lines changed

6 files changed

+77
-48
lines changed

.deny.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@ skip-tree = [
1313
{ name = "bit-set", version = "0.5.3" },
1414
{ name = "bit-vec", version = "0.6.3" },
1515
{ name = "capacity_builder", version = "0.1.3" },
16-
{ name = "itertools", version = "0.10.5" },
1716
]
1817
skip = [
18+
# criterion uses an old version
19+
{ name = "itertools", version = "0.10.5" },
20+
# bindgen (used by deno) uses old version
21+
{ name = "itertools", version = "0.13.0" },
22+
# loom (used by tracy-client) uses old `matchers` crate
23+
{ name = "regex-automata", version = "0.1.10" },
24+
{ name = "regex-syntax", version = "0.6.29" },
1925
# Strum uses an old version
2026
{ name = "heck", version = "0.4.0" },
2127
# Deno uses an old version

Cargo.lock

Lines changed: 59 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ cfg_aliases = "0.2.1"
9898
cfg-if = "1"
9999
criterion = "0.5"
100100
codespan-reporting = { version = "0.12", default-features = false }
101-
ctor = "0.2"
101+
ctor = "0.4"
102102
document-features = "0.2.11"
103103
encase = "0.10.0"
104104
env_logger = "0.11"
@@ -112,10 +112,10 @@ hashbrown = { version = "0.15.2", default-features = false, features = [
112112
"inline-more",
113113
] }
114114
heck = "0.5.0"
115-
image = { version = "0.24", default-features = false, features = ["png"] }
115+
image = { version = "0.25", default-features = false, features = ["png"] }
116116
indexmap = { version = "2.7.1", default-features = false }
117-
itertools = { version = "0.13.0" }
118-
ktx2 = "0.3"
117+
itertools = { version = "0.14.0" }
118+
ktx2 = "0.4"
119119
libc = { version = "0.2", default-features = false }
120120
libloading = "0.8"
121121
libtest-mimic = "0.8.1"
@@ -141,7 +141,7 @@ profiling = { version = "1", default-features = false }
141141
raw-window-handle = { version = "0.6.2", default-features = false }
142142
rayon = "1"
143143
renderdoc-sys = "1.1.0"
144-
ron = "0.9"
144+
ron = "0.10"
145145
# NOTE: rustc-hash v2 is a completely different hasher with different performance characteristics
146146
# see discussion here (including with some other alternatives): https://github.com/gfx-rs/wgpu/issues/6999
147147
# (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"
150150
serde = { version = "1", default-features = false }
151151
smallvec = "1"
152152
static_assertions = "1.1.0"
153-
strum = { version = "0.26.3", default-features = false, features = ["derive"] }
153+
strum = { version = "0.27.1", default-features = false, features = ["derive"] }
154154
trybuild = "1"
155-
tracy-client = "0.17"
155+
tracy-client = "0.18"
156156
thiserror = { version = "2", default-features = false }
157157
walkdir = "2"
158158
winit = { version = "0.29", features = ["android-native-activity"] }
@@ -208,7 +208,7 @@ tokio = "1.44.2"
208208
termcolor = "1.4.1"
209209

210210
# android dependencies
211-
ndk-sys = "0.5.0"
211+
ndk-sys = "0.6.0"
212212

213213
# These overrides allow our examples to explicitly depend on release crates
214214
[patch.crates-io]

examples/features/src/skybox/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ impl crate::framework::Example for Example {
322322

323323
let mut image = Vec::with_capacity(reader.data().len());
324324
for level in reader.levels() {
325-
image.extend_from_slice(level);
325+
image.extend_from_slice(level.data);
326326
}
327327

328328
let texture = device.create_texture_with_data(

tests/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub use init::initialize_html_canvas;
1919
pub use self::image::ComparisonType;
2020
pub use config::GpuTestConfiguration;
2121
#[doc(hidden)]
22-
pub use ctor::ctor;
22+
pub use ctor;
2323
pub use expectations::{FailureApplicationReasons, FailureBehavior, FailureCase, FailureReason};
2424
pub use init::{initialize_adapter, initialize_device, initialize_instance};
2525
pub use params::TestParameters;

wgpu-macros/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn gpu_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
1919

2020
quote! {
2121
#[cfg(not(target_arch = "wasm32"))]
22-
#[::wgpu_test::ctor]
22+
#[::wgpu_test::ctor::ctor(crate_path = ::wgpu_test::ctor)]
2323
fn #register_test_name() {
2424
struct S;
2525

0 commit comments

Comments
 (0)