Unify validation error presentation in Naga CLI and WebGPU compilation messages

CHANGELOG.md

@@ -86,6 +86,8 @@ By @bradwerth [#6216](https://github.com/gfx-rs/wgpu/pull/6216).
 - Implemented `const_assert` in WGSL. By @sagudev in [#6198](https://github.com/gfx-rs/wgpu/pull/6198).
 - Support polyfilling `inverse` in WGSL. By @chyyran in [#6385](https://github.com/gfx-rs/wgpu/pull/6385).
 - Add an internal skeleton for parsing `requires`, `enable`, and `diagnostic` directives that don't yet do anything besides emit nicer errors. By @ErichDonGubler in [#6352](https://github.com/gfx-rs/wgpu/pull/6352).
+- Include error chain information as a message and notes in shader compilation messages. By @ErichDonGubler in [#6436](https://github.com/gfx-rs/wgpu/pull/6436).
+- Unify Naga CLI error output with the format of shader compilation messages. By @ErichDonGubler in [#6436](https://github.com/gfx-rs/wgpu/pull/6436).
 
 #### General
 

naga-cli/src/bin/naga.rs

@@ -516,9 +516,10 @@ fn run() -> anyhow::Result<()> {
             // Validation failure is not fatal. Just report the error.
             if let Some(input) = &input_text {
                 let filename = input_path.file_name().and_then(std::ffi::OsStr::to_str);
-                emit_annotated_error(&error, filename.unwrap_or("input"), input);
+                error.emit_to_stderr_with_path(input, filename.unwrap_or("input"));
+            } else {
+                print_err(&error);
             }
-            print_err(&error);
             None
         }
     };
@@ -544,9 +545,10 @@ fn run() -> anyhow::Result<()> {
                     eprintln!("Error validating compacted module:");
                     if let Some(input) = &input_text {
                         let filename = input_path.file_name().and_then(std::ffi::OsStr::to_str);
-                        emit_annotated_error(&error, filename.unwrap_or("input"), input);
+                        error.emit_to_stderr_with_path(input, filename.unwrap_or("input"));
+                    } else {
+                        print_err(&error);
                     }
-                    print_err(&error);
                     None
                 }
             }
@@ -869,9 +871,10 @@ fn bulk_validate(args: Args, params: &Parameters) -> anyhow::Result<()> {
             eprintln!("Error validating {input_path}:");
             if let Some(input) = &input_text {
                 let filename = path.file_name().and_then(std::ffi::OsStr::to_str);
-                emit_annotated_error(&error, filename.unwrap_or("input"), input);
+                error.emit_to_stderr_with_path(input, filename.unwrap_or("input"));
+            } else {
+                print_err(&error);
             }
-            print_err(&error);
         }
     }
 
@@ -892,29 +895,5 @@ fn bulk_validate(args: Args, params: &Parameters) -> anyhow::Result<()> {
     Ok(())
 }
 
-use codespan_reporting::{
-    diagnostic::{Diagnostic, Label},
-    files::SimpleFile,
-    term::{
-        self,
-        termcolor::{ColorChoice, StandardStream},
-    },
-};
-use naga::{FastHashMap, WithSpan};
-
-pub fn emit_annotated_error<E: Error>(ann_err: &WithSpan<E>, filename: &str, source: &str) {
-    let files = SimpleFile::new(filename, source);
-    let config = codespan_reporting::term::Config::default();
-    let writer = StandardStream::stderr(ColorChoice::Auto);
-
-    let diagnostic = Diagnostic::error().with_labels(
-        ann_err
-            .spans()
-            .map(|(span, desc)| {
-                Label::primary((), span.to_range().unwrap()).with_message(desc.to_owned())
-            })
-            .collect(),
-    );
-
-    term::emit(&mut writer.lock(), &config, &files, &diagnostic).expect("cannot write error");
-}
+use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
+use naga::FastHashMap;

naga/src/error.rs

@@ -34,28 +34,14 @@ impl fmt::Display for ShaderError<crate::front::spv::Error> {
 }
 impl fmt::Display for ShaderError<crate::WithSpan<crate::valid::ValidationError>> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use codespan_reporting::{
-            diagnostic::{Diagnostic, Label},
-            files::SimpleFile,
-            term,
-        };
+        use codespan_reporting::{files::SimpleFile, term};
 
         let label = self.label.as_deref().unwrap_or_default();
         let files = SimpleFile::new(label, &self.source);
         let config = term::Config::default();
         let mut writer = termcolor::NoColor::new(Vec::new());
-
-        let diagnostic = Diagnostic::error().with_labels(
-            self.inner
-                .spans()
-                .map(|&(span, ref desc)| {
-                    Label::primary((), span.to_range().unwrap()).with_message(desc.to_owned())
-                })
-                .collect(),
-        );
-
-        term::emit(&mut writer, &config, &files, &diagnostic).expect("cannot write error");
-
+        term::emit(&mut writer, &config, &files, &self.inner.diagnostic())
+            .expect("cannot write error");
         write!(
             f,
             "\nShader validation {}",

naga/src/span.rs

@@ -239,7 +239,7 @@ impl<E> WithSpan<E> {
         Some(self.spans[0].0.location(source))
     }
 
-    fn diagnostic(&self) -> codespan_reporting::diagnostic::Diagnostic<()>
+    pub(crate) fn diagnostic(&self) -> codespan_reporting::diagnostic::Diagnostic<()>
     where
         E: Error,
     {