diff --git a/Cargo.lock b/Cargo.lock
index e6a149110b..bda80b068e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1032,7 +1032,7 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/naga?rev=0e2bb019#0e2bb0194b029c388a70403d36a82d5fc774d307"
+source = "git+https://github.com/gfx-rs/naga?rev=85056524#850565243d1d0d03215f13246c94d63e1d4c51cd"
 dependencies = [
  "bit-set",
  "bitflags",
@@ -1048,7 +1048,7 @@ dependencies = [
  "spirv",
  "termcolor",
  "thiserror",
- "unicode-id",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -1726,12 +1726,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "unicode-id"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe8d9274f490a36442acb4edfd0c4e473fdfc6a8b5cd32f28a0235761aedbe"
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.8.0"
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
index 908a8ac34c..3711818264 100644
--- a/wgpu-core/Cargo.toml
+++ b/wgpu-core/Cargo.toml
@@ -40,7 +40,7 @@ thiserror = "1"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "0e2bb019"
+rev = "85056524"
 #version = "0.8"
 features = ["span", "validate", "wgsl-in"]
 
diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
index fc4260a53f..f5d6c52d73 100644
--- a/wgpu-hal/Cargo.toml
+++ b/wgpu-hal/Cargo.toml
@@ -91,14 +91,14 @@ js-sys = { version = "0.3" }
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "0e2bb019"
+rev = "85056524"
 #version = "0.8"
 
 # DEV dependencies
 
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "0e2bb019"
+rev = "85056524"
 #version = "0.8"
 features = ["wgsl-in"]
 
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index ede85ac27a..63f0dbb338 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -139,20 +139,20 @@ env_logger = "0.9"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "0e2bb019"
+rev = "85056524"
 #version = "0.8"
 optional = true
 
 # used to test all the example shaders
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "0e2bb019"
+rev = "85056524"
 #version = "0.8"
 features = ["wgsl-in"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "0e2bb019"
+rev = "85056524"
 #version = "0.8"
 features = ["wgsl-out"]