From be16f8ce186df4b445627aba36f89243be34c500 Mon Sep 17 00:00:00 2001 From: Andy Leiserson Date: Tue, 8 Apr 2025 11:45:44 -0700 Subject: [PATCH] Use `ty.for_debug` --- naga/src/proc/typifier.rs | 3 ++- naga/tests/naga/wgsl_errors.rs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/naga/src/proc/typifier.rs b/naga/src/proc/typifier.rs index 535e52540..baa8203ad 100644 --- a/naga/src/proc/typifier.rs +++ b/naga/src/proc/typifier.rs @@ -614,7 +614,8 @@ impl<'a> ResolveContext<'a> { TypeResolution::Value(bool) } else { return Err(ResolveError::IncompatibleOperands(format!( - "{op:?}({ty:?}, _)" + "{op:?}({:?}, _)", + ty.for_debug(types), ))); } } diff --git a/naga/tests/naga/wgsl_errors.rs b/naga/tests/naga/wgsl_errors.rs index 9e85ab5c8..22cdbc781 100644 --- a/naga/tests/naga/wgsl_errors.rs +++ b/naga/tests/naga/wgsl_errors.rs @@ -3185,7 +3185,7 @@ fn vector_logical_ops() { "fn foo(a: vec2, b: vec2) { let y = a && b; }", - r#"error: Incompatible operands: LogicalAnd(Vector { size: Bi, scalar: Scalar { kind: Bool, width: 1 } }, _) + r#"error: Incompatible operands: LogicalAnd(vec2, _) "#, ); @@ -3194,7 +3194,7 @@ fn vector_logical_ops() { "fn foo(a: vec2, b: vec2) { let y = a || b; }", - r#"error: Incompatible operands: LogicalOr(Vector { size: Bi, scalar: Scalar { kind: Bool, width: 1 } }, _) + r#"error: Incompatible operands: LogicalOr(vec2, _) "#, );