diff --git a/Cargo.lock b/Cargo.lock index 1addaf0540..ce3a3c1d07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,15 +123,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "ci_info" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f0e2864372242f01b92c1b882a904f6fb8b57f16e81e148a35b6368b1ea7323" -dependencies = [ - "envmnt", -] - [[package]] name = "crossterm" version = "0.21.0" @@ -186,12 +177,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "dunce" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" - [[package]] name = "either" version = "1.6.1" @@ -215,25 +200,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "envmnt" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f96dd862f12fac698dec3932dff0e6fb34bffeb5515ae5932d620cfe076571e" -dependencies = [ - "fsio", - "indexmap", -] - -[[package]] -name = "fsio" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e87827efaf94c7a44b562ff57de06930712fe21b530c3797cdede26e6377eb" -dependencies = [ - "dunce", -] - [[package]] name = "getrandom" version = "0.2.3" @@ -257,12 +223,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - [[package]] name = "hermit-abi" version = "0.1.19" @@ -272,16 +232,6 @@ dependencies = [ "libc", ] -[[package]] -name = "indexmap" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" -dependencies = [ - "autocfg", - "hashbrown", -] - [[package]] name = "instant" version = "0.1.10" @@ -291,6 +241,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "is_ci" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" + [[package]] name = "itertools" version = "0.10.1" @@ -338,13 +294,12 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "miette" -version = "3.0.1-alpha.0" -source = "git+https://github.com/zkat/miette?branch=release/3.0.0#e02965787b5e6206dad46556a50edae578449789" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b98aebb9d23c72cb22c089834ea59be059c6f462e844fd9fd18dd0168ad149c" dependencies = [ "atty", "backtrace", - "ci_info", - "itertools", "miette-derive", "once_cell", "owo-colors", @@ -358,8 +313,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "3.0.0-alpha.0" -source = "git+https://github.com/zkat/miette?branch=release/3.0.0#e02965787b5e6206dad46556a50edae578449789" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a7cd3347eb52480d4ba59d71ce2b48b8b128034e17068c7e2ff3766c2e87a3" dependencies = [ "proc-macro2", "quote", @@ -526,9 +482,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fe43bf372b08cc9ccee5144715db59c79ab00168bbe4cf0d274dc0d5f64d7f" +checksum = "3a61765925aec40abdb23812a3a1a01fafc6ffb9da22768b2ce665a9e84e527c" [[package]] name = "parking_lot" @@ -788,14 +744,12 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "supports-color" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bc06147993f379a124cc6373ad4022f5d9fd4a80019217c773f81a38e9023c" +checksum = "32f5b0f9e689dd52e27228469dd68b7416b60d75b7571ae9060a5f4c50048fee" dependencies = [ "atty", - "ci_info", - "lazy_static", - "regex", + "is_ci", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 767c737642..dd6206c3de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,8 +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 = { git = "https://github.com/zkat/miette", branch = "release/3.0.0" } -# miette = { path = "../miette" } +miette = "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 005bc686be..117fe77d98 100644 --- a/crates/nu-cli/Cargo.toml +++ b/crates/nu-cli/Cargo.toml @@ -7,8 +7,7 @@ edition = "2018" nu-engine = { path = "../nu-engine" } nu-parser = { path = "../nu-parser" } nu-protocol = { path = "../nu-protocol" } -miette = { git = "https://github.com/zkat/miette", branch = "release/3.0.0", features = ["fancy"] } -# miette = { path = "../../../miette", features = ["fancy"] } +miette = { version = "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 b3775feedf..96dd9444a5 100644 --- a/crates/nu-parser/Cargo.toml +++ b/crates/nu-parser/Cargo.toml @@ -4,7 +4,6 @@ version = "0.1.0" edition = "2018" [dependencies] -miette = { git = "https://github.com/zkat/miette", branch = "release/3.0.0" } -# miette = { path = "../../../miette" } +miette = "3.0.0" thiserror = "1.0.29" nu-protocol = { path = "../nu-protocol"} diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml index 1f92f67651..1d12bba4d8 100644 --- a/crates/nu-protocol/Cargo.toml +++ b/crates/nu-protocol/Cargo.toml @@ -7,5 +7,4 @@ edition = "2018" [dependencies] thiserror = "1.0.29" -miette = { git = "https://github.com/zkat/miette", branch = "release/3.0.0" } -# miette = { path = "../../../miette" } +miette = "3.0.0"