Merge pull request #29 from axodotdev/opt-label

use options for labels
axodotdev · Apr 4, 2023 · e33448f · e33448f
2 parents 2b8825e + c9962be
commit e33448f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -275,7 +275,7 @@ pub enum AxoassetError {
         source: crate::SourceFile,
         /// The range the error was found on
         #[label]
-        span: miette::SourceSpan,
+        span: Option<miette::SourceSpan>,
         /// Details of the error
         #[source]
         details: serde_json::Error,
@@ -291,7 +291,7 @@ pub enum AxoassetError {
         source: crate::SourceFile,
         /// The range the error was found on
         #[label]
-        span: miette::SourceSpan,
+        span: Option<miette::SourceSpan>,
         /// Details of the error
         #[source]
         details: toml::de::Error,

diff --git a/src/source.rs b/src/source.rs
@@ -81,9 +81,7 @@ impl SourceFile {
     #[cfg(feature = "json-serde")]
     pub fn deserialize_json<'a, T: serde::Deserialize<'a>>(&'a self) -> Result<T> {
         let json = serde_json::from_str(self.source()).map_err(|details| {
-            let span = self
-                .span_for_line_col(details.line(), details.column())
-                .unwrap_or((0..0).into());
+            let span = self.span_for_line_col(details.line(), details.column());
             AxoassetError::Json {
                 source: self.clone(),
                 span,
@@ -99,8 +97,7 @@ impl SourceFile {
         let toml = toml::from_str(self.source()).map_err(|details| {
             let span = details
                 .line_col()
-                .and_then(|(line, col)| self.span_for_line_col(line, col))
-                .unwrap_or((0..0).into());
+                .and_then(|(line, col)| self.span_for_line_col(line, col));
             AxoassetError::Toml {
                 source: self.clone(),
                 span,