nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-10-29 21:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(naga-cli): inline emit_annotated_error

Browse Source
This commit is contained in:
Erich Gubler 2024-10-21 11:13:22 -04:00
parent 28912feb00
commit 7aa00a07e1
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
naga-cli/src/bin/naga.rs
View File

@ -516,7 +516,7 @@ 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);
}
@ -545,7 +545,7 @@ 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);
}
@ -871,7 +871,7 @@ 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);
}
@ -896,8 +896,4 @@ fn bulk_validate(args: Args, params: &Parameters) -> anyhow::Result<()> {
}
use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
use naga::{FastHashMap, WithSpan};
pub fn emit_annotated_error<E: Error>(ann_err: &WithSpan<E>, filename: &str, source: &str) {
ann_err.emit_to_stderr_with_path(source, filename);
}
use naga::FastHashMap;