From afd3fd31bf786203a0cbbde68b7686a7720d6a47 Mon Sep 17 00:00:00 2001
From: Andreas Reich <r_andreas2@web.de>
Date: Tue, 1 Oct 2024 09:58:34 +0200
Subject: [PATCH 1/2] Update `cfg_aliases`

---
 Cargo.lock | 20 +++++++++++++-------
 Cargo.toml |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3c8d1aacce..9fd7539355 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -461,6 +461,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "cgl"
 version = "0.3.2"
@@ -1325,7 +1331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746"
 dependencies = [
  "bitflags 2.6.0",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
  "cgl",
  "core-foundation",
  "dispatch",
@@ -1347,7 +1353,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735"
 dependencies = [
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
  "glutin",
  "raw-window-handle 0.5.2",
  "winit",
@@ -1875,7 +1881,7 @@ dependencies = [
  "arrayvec",
  "bit-set",
  "bitflags 2.6.0",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
  "codespan-reporting",
  "diff",
  "env_logger",
@@ -3578,7 +3584,7 @@ name = "wgpu"
 version = "22.0.0"
 dependencies = [
  "arrayvec",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
  "document-features",
  "js-sys",
  "log",
@@ -3622,7 +3628,7 @@ dependencies = [
  "bit-vec",
  "bitflags 2.6.0",
  "bytemuck",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
  "document-features",
  "indexmap",
  "log",
@@ -3682,7 +3688,7 @@ dependencies = [
  "bitflags 2.6.0",
  "block",
  "cfg-if",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
  "core-graphics-types",
  "env_logger",
  "glam",
@@ -4122,7 +4128,7 @@ dependencies = [
  "bitflags 2.6.0",
  "bytemuck",
  "calloop",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
  "core-foundation",
  "core-graphics",
  "cursor-icon",
diff --git a/Cargo.toml b/Cargo.toml
index fbf06524c1..9640201699 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,7 +77,7 @@ bincode = "1"
 bit-vec = "0.8"
 bitflags = "2.6"
 bytemuck = { version = "1.18", features = ["derive"] }
-cfg_aliases = "0.1"
+cfg_aliases = "0.2.1"
 cfg-if = "1"
 criterion = "0.5"
 codespan-reporting = "0.11"

From 137908068d196b8159464aabd775bce84f55dd6e Mon Sep 17 00:00:00 2001
From: Andreas Reich <r_andreas2@web.de>
Date: Tue, 1 Oct 2024 10:05:15 +0200
Subject: [PATCH 2/2] allow unused `wgpu_validate_locks`

---
 wgpu-core/Cargo.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
index 1b9ce98488..4925302d6c 100644
--- a/wgpu-core/Cargo.toml
+++ b/wgpu-core/Cargo.toml
@@ -29,6 +29,11 @@ targets = [
 # Cargo machete can't check build.rs dependencies. See https://github.com/bnjbvr/cargo-machete/issues/100
 ignored = ["cfg_aliases"]
 
+[lints.rust]
+# The `wgpu_validate_locks` config is supposed to be set via `RUSTFLAGS='--cfg wgpu_validate_locks'`
+# If set, `wgpu-core` uses the [`ranked`] module's locks. We hope to make this the default for debug builds soon.
+unexpected_cfgs = { level = "allow", check-cfg = ['cfg(wgpu_validate_locks)'] }
+
 [lib]
 
 [features]