[naga wgsl-in] Use a better span for errors in constructors.

When reporting errors in construction expressions, use the span of the constructor itself (that is, the type name) in preference to the span of the overall expression. This makes errors easier to follow.
gfx-rs · Dec 4, 2023 · 07b83ab · 07b83ab
1 parent 1823f8b
commit 07b83ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/naga/src/front/wgsl/lower/construction.rs b/naga/src/front/wgsl/lower/construction.rs
@@ -448,7 +448,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
                 ctx.try_automatic_conversions_slice(
                     &mut components,
                     &Tr::Value(component_ty),
-                    span,
+                    ty_span,
                 )?;
                 expr = crate::Expression::Compose { ty, components };
             }
@@ -497,7 +497,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
             // Array constructor, explicit type
             (components, Constructor::Type((ty, &crate::TypeInner::Array { base, .. }))) => {
                 let mut components = components.into_components_vec();
-                ctx.try_automatic_conversions_slice(&mut components, &Tr::Handle(base), span)?;
+                ctx.try_automatic_conversions_slice(&mut components, &Tr::Handle(base), ty_span)?;
                 expr = crate::Expression::Compose { ty, components };
             }
 

diff --git a/naga/tests/wgsl_errors.rs b/naga/tests/wgsl_errors.rs
@@ -213,9 +213,8 @@ fn constructor_parameter_type_mismatch() {
   ┌─ wgsl:3:21
   │
 3 │                 _ = mat2x2<f32>(array(0, 1), vec2(2, 3));
-  │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  │                     │           │
-  │                     │           this expression has type array<{AbstractInt}, 2>
+  │                     ^^^^^^^^^^^ ^^^^^^^^^^^ this expression has type array<{AbstractInt}, 2>
+  │                     │            
   │                     a value of type vec2<f32> is required here
 
 "#,