SYNC POINT: merge

Author: ErichDonGubler

Cargo.toml

@@ -27,25 +27,25 @@ members = [
 ]
 exclude = []
 default-members = [
-    "benches",
-    "examples/features",
-    "examples/standalone/*",
-    "lock-analyzer",
-    "naga-cli",
+    # "benches",
+    # "examples/features",
+    # "examples/standalone/*",
+    # "lock-analyzer",
+    # "naga-cli",
     "naga",
-    "naga/fuzz",
-    "naga/hlsl-snapshots",
-    "naga/xtask",
-    "player",
-    "tests",
-    "wgpu-core",
-    "wgpu-core/platform-deps/*",
-    "wgpu-hal",
-    "wgpu-info",
-    "wgpu-macros",
-    "wgpu-types",
-    "wgpu",
-    "xtask",
+    # "naga/fuzz",
+    # "naga/hlsl-snapshots",
+    # "naga/xtask",
+    # "player",
+    # "tests",
+    # "wgpu-core",
+    # "wgpu-core/platform-deps/*",
+    # "wgpu-hal",
+    # "wgpu-info",
+    # "wgpu-macros",
+    # "wgpu-types",
+    # "wgpu",
+    # "xtask",
 ]
 
 [workspace.lints.clippy]

naga/tests/naga/validation.rs

@@ -645,6 +645,27 @@ fn binding_arrays_cannot_hold_scalars() {
     assert!(t.validator.validate(&t.module).is_err());
 }
 
+#[cfg(feature = "wgsl-in")]
+#[track_caller]
+fn assert_wgsl_validation_err(input: &str, snapshot: &str) {
+    let module = naga::front::wgsl::parse_str(input)
+        .expect("expected parsed WGSL module, but WGSL parse failed");
+    let err = valid::Validator::new(Default::default(), valid::Capabilities::all())
+        .validate(&module)
+        .expect_err("module should be invalid");
+    let output = err.emit_to_string(input);
+    if output != snapshot {
+        for diff in diff::lines(snapshot, &output) {
+            match diff {
+                diff::Result::Left(l) => println!("-{l}"),
+                diff::Result::Both(l, _) => println!(" {l}"),
+                diff::Result::Right(r) => println!("+{r}"),
+            }
+        }
+        panic!("Error snapshot failed");
+    }
+}
+
 #[cfg(feature = "wgsl-in")]
 #[test]
 fn validation_error_messages() {
@@ -673,12 +694,7 @@ error: Function [1] 'main' is invalid
     )];
 
     for (source, expected_err) in cases {
-        let module = naga::front::wgsl::parse_str(source).unwrap();
-        let err = valid::Validator::new(Default::default(), valid::Capabilities::all())
-            .validate(&module)
-            .expect_err("module should be invalid");
-        println!("{}", err.emit_to_string(source));
-        assert_eq!(err.emit_to_string(source), expected_err);
+        assert_wgsl_validation_err(source, expected_err)
     }
 }