Skip to content

Commit

Permalink
feat: impl FromStr for naga::wgsl::error::Severity
Browse files Browse the repository at this point in the history
  • Loading branch information
ErichDonGubler committed Oct 25, 2024
1 parent 69fb827 commit 9b6f777
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
9 changes: 9 additions & 0 deletions naga/src/diagnostic_filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use indexmap::IndexMap;
use serde::Deserialize;
#[cfg(feature = "serialize")]
use serde::Serialize;
use std::str::FromStr;

/// A severity set on a [`DiagnosticFilter`].
///
Expand Down Expand Up @@ -67,6 +68,14 @@ impl Severity {
}
}

impl FromStr for Severity {
type Err = ();

fn from_str(s: &str) -> Result<Self, Self::Err> {
Self::from_ident(s).ok_or(())
}
}

/// A filterable triggering rule in a [`DiagnosticFilter`].
///
/// <https://www.w3.org/TR/WGSL/#filterable-triggering-rules>
Expand Down
11 changes: 6 additions & 5 deletions naga/src/front/wgsl/parse/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2649,11 +2649,12 @@ impl Parser {
lexer.expect(Token::Paren('('))?;

let (severity_control_name, severity_control_name_span) = lexer.next_ident_with_span()?;
let new_severity = diagnostic_filter::Severity::from_ident(severity_control_name).ok_or(
Error::DiagnosticInvalidSeverity {
severity_control_name_span,
},
)?;
let new_severity =
severity_control_name
.parse()
.map_err(|()| Error::DiagnosticInvalidSeverity {
severity_control_name_span,
})?;

lexer.expect(Token::Separator(','))?;

Expand Down

0 comments on commit 9b6f777

Please sign in to comment.