bump to miette-7 (#21)

jdx · Dec 9, 2024 · 9b049ed · 9b049ed
1 parent 3fc2181
commit 9b049ed
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 67 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -33,9 +33,9 @@ exec = "0.3"
 heck = "0.5"
 indexmap = "2"
 itertools = "0.13"
-kdl = "<4.7"
+kdl = "4"
 log = "0.4"
-miette = { version = "5", features = ["fancy"] }
+miette = { version = "7", features = ["fancy"] }
 once_cell = "1"
 regex = "1"
 serde = { version = "1", features = ["derive"] }
@@ -44,7 +44,7 @@ strum = { version = "0.26", features = ["derive"] }
 tera = "1"
 thiserror = "2"
 usage-lib = { workspace = true, features = ["clap", "docs"] }
-xx = "1"
+xx = "2"
 
 [dev-dependencies]
 assert_cmd = { version = "2", features = ["color-auto"] }

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -25,17 +25,17 @@ clap = { version = "4", features = ["derive", "string"], optional = true }
 heck = "0.5"
 indexmap = { version = "2", features = ["serde"] }
 itertools = "0.13"
-kdl = "<4.7"
+kdl = "4"
 log = "0.4"
-miette = "5"
+miette = "7"
 once_cell = "1"
 regex = "1"
 serde = { version = "1", features = ["derive"] }
 strum = { version = "0.26", features = ["derive"] }
 tera = { version = "1", optional = true }
 thiserror = "2"
 versions = "6"
-xx = "1"
+xx = "2"
 
 [features]
 default = ["docs"]

diff --git a/lib/src/error.rs b/lib/src/error.rs
@@ -13,7 +13,7 @@ pub enum UsageErr {
     InvalidInput(
         String,
         #[label = "{0}"] SourceSpan,
-        #[source_code] NamedSource,
+        #[source_code] NamedSource<String>,
     ),
 
     #[error("Missing required arg: <{0}>")]
@@ -52,13 +52,15 @@ pub type Result<T> = std::result::Result<T, UsageErr>;
 #[macro_export]
 macro_rules! bail_parse {
     ($ctx:expr, $span:expr, $fmt:literal) => {{
+        let span: miette::SourceSpan = ($span.offset(), $span.len()).into();
         let msg = format!($fmt);
-        let err = $ctx.build_err(msg, $span);
+        let err = $ctx.build_err(msg, span);
         return std::result::Result::Err(err);
     }};
     ($ctx:expr, $span:expr, $fmt:literal, $($arg:tt)*) => {{
+        let span: miette::SourceSpan = ($span.offset(), $span.len()).into();
         let msg = format!($fmt, $($arg)*);
-        let err = $ctx.build_err(msg, $span);
+        let err = $ctx.build_err(msg, span);
         return std::result::Result::Err(err);
     }};
 }
diff --git a/lib/src/spec/helpers.rs b/lib/src/spec/helpers.rs
@@ -22,7 +22,7 @@ impl<'a> NodeHelper<'a> {
         self.node.name().value()
     }
     pub(crate) fn span(&self) -> SourceSpan {
-        *self.node.span()
+        (self.node.span().offset(), self.node.span().len()).into()
     }
     pub(crate) fn ensure_arg_len<R>(&self, range: R) -> Result<&Self, UsageErr>
     where
@@ -92,7 +92,7 @@ impl<'a> ParseEntry<'a> {
     }
 
     fn span(&self) -> SourceSpan {
-        *self.entry.span()
+        (self.entry.span().offset(), self.entry.span().len()).into()
     }
 }
 

diff --git a/mise.lock b/mise.lock
@@ -5,6 +5,7 @@ version = "1.7.4"
 version = "1.10.8"
 
 [tools.cargo-binstall.checksums]
+"cargo-binstall-aarch64-apple-darwin.zip" = "sha256:23a27d534c98fed95e88c320fd7de154f851af7bce9100eed15e72fee316804c"
 cargo-binstall-macos-aarch64 = "sha256:c30a499060745f0c4435a446253fc676838cff0a18d2dd555fcf10399176b1bf"
 
 [tools."cargo:cargo-edit"]