diff --git a/Cargo.lock b/Cargo.lock index 415ec4d2b6..827d3a0ffa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -296,9 +296,8 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "miette" -version = "3.0.0-alpha.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043a986fa0bf30fe00f6720e5c298ed1d67fe30ae77659744cbac206e8d2554c" +version = "3.0.1-alpha.0" +source = "git+https://github.com/zkat/miette?branch=release/3.0.0#338c885a305035fc21f63e3566131af5befa14b3" dependencies = [ "atty", "ci_info", @@ -318,8 +317,7 @@ dependencies = [ [[package]] name = "miette-derive" version = "3.0.0-alpha.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3027fb091be28062da879441b2ab8f43d0013d7cde5fcc3a48fb9da7e22a01" +source = "git+https://github.com/zkat/miette?branch=release/3.0.0#338c885a305035fc21f63e3566131af5befa14b3" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 692383fb5e..fed8886c5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ nu-engine = { path="./crates/nu-engine" } nu-parser = { path="./crates/nu-parser" } nu-protocol = { path = "./crates/nu-protocol" } nu-table = { path = "./crates/nu-table" } -miette = { version = "3.0.0-alpha.0" } +miette = { git = "https://github.com/zkat/miette", branch = "release/3.0.0" } # mimalloc = { version = "*", default-features = false } [dev-dependencies] diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml index 042663b801..de747e92cb 100644 --- a/crates/nu-cli/Cargo.toml +++ b/crates/nu-cli/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" nu-engine = { path = "../nu-engine" } nu-parser = { path = "../nu-parser" } nu-protocol = { path = "../nu-protocol" } -miette = { version = "3.0.0-alpha.0", features = ["fancy"] } +miette = { git = "https://github.com/zkat/miette", branch = "release/3.0.0", features = ["fancy"] } thiserror = "1.0.29" nu-ansi-term = "0.36.0" reedline = { git = "https://github.com/jntrnr/reedline", branch = "main" } diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml index 4221db951e..23c52451a2 100644 --- a/crates/nu-parser/Cargo.toml +++ b/crates/nu-parser/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.0" edition = "2018" [dependencies] -miette = { version = "3.0.0-alpha.0" } +miette = { git = "https://github.com/zkat/miette", branch = "release/3.0.0" } thiserror = "1.0.29" nu-protocol = { path = "../nu-protocol"} diff --git a/crates/nu-parser/src/errors.rs b/crates/nu-parser/src/errors.rs index 1506723eec..fffb3c0b06 100644 --- a/crates/nu-parser/src/errors.rs +++ b/crates/nu-parser/src/errors.rs @@ -39,7 +39,7 @@ pub enum ParseError { #[diagnostic(code(nu::parser::type_mismatch), url(docsrs))] Mismatch(String, String, #[label("expected {0}, found {1}")] Span), // expected, found, span - #[error("Unsupported operation.")] + #[error("Types mismatched for operation.")] #[diagnostic( code(nu::parser::unsupported_operation), url(docsrs), diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml index 2949bff8fd..c7b64c54c3 100644 --- a/crates/nu-protocol/Cargo.toml +++ b/crates/nu-protocol/Cargo.toml @@ -7,4 +7,4 @@ edition = "2018" [dependencies] thiserror = "1.0.29" -miette = { version = "3.0.0-alpha.0" } +miette = { git = "https://github.com/zkat/miette", branch = "release/3.0.0" }