Update naga 0.9

PolyMeilex · Jul 2, 2022 · 328fa0f · 328fa0f
1 parent f10bb4d
commit 328fa0f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,4 +15,4 @@ walkdir = "2.3"
 serde = { version = "1.0", features = ["derive"] }
 jsonrpc-stdio-server = "18.0.0"
 tokio = { version = "1", features = ["rt-multi-thread", "io-util", "time", "net"]}
-naga = { version = "0.8.0", features = ["wgsl-in", "validate"] }
+naga = { version = "0.9.0", features = ["wgsl-in", "validate"] }
diff --git a/src/wgsl_error.rs b/src/wgsl_error.rs
@@ -19,8 +19,20 @@ impl From<std::io::Error> for WgslError {
 
 impl WgslError {
     pub fn from_parse_err(err: ParseError, src: &str) -> Self {
-        let (line, pos) = err.location(src);
         let error = err.emit_to_string(src);
-        Self::ParserErr { error, line, pos }
+        let loc = err.location(src);
+        if let Some(loc) = loc {
+            Self::ParserErr {
+                error,
+                line: loc.line_number as usize,
+                pos: loc.line_position as usize,
+            }
+        } else {
+            Self::ParserErr {
+                error,
+                line: 0,
+                pos: 0,
+            }
+        }
     }
 }