diff --git a/Cargo.lock b/Cargo.lock index 123d35b12..ca7febae6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1020,7 +1020,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "miden-core", - "miette", + "miden-miette", "pretty_assertions", "regex", "rustc_version 0.4.1", @@ -1039,7 +1039,7 @@ dependencies = [ "memchr", "miden-crypto", "miden-formatting", - "miette", + "miden-miette", "num-derive", "num-traits", "parking_lot", @@ -1090,6 +1090,48 @@ dependencies = [ "winter-math", ] +[[package]] +name = "miden-miette" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eef536978f24a179d94fa2a41e4f92b28e7d8aab14b8d23df28ad2a3d7098b20" +dependencies = [ + "backtrace", + "backtrace-ext", + "cfg-if", + "futures", + "indenter", + "lazy_static", + "miden-miette-derive", + "owo-colors", + "regex", + "rustc_version 0.2.3", + "rustversion", + "serde_json", + "spin", + "strip-ansi-escapes", + "supports-color", + "supports-hyperlinks", + "supports-unicode", + "syn", + "terminal_size", + "textwrap", + "thiserror 2.0.3", + "trybuild", + "unicode-width 0.1.14", +] + +[[package]] +name = "miden-miette-derive" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86a905f3ea65634dd4d1041a4f0fd0a3e77aa4118341d265af1a94339182222f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "miden-processor" version = "0.11.0" @@ -1200,46 +1242,6 @@ dependencies = [ "winter-fri", ] -[[package]] -name = "miette" -version = "7.1.0" -source = "git+https://github.com/0xPolygonMiden/miette?branch=pgackst-thiserror-2#eed93caaf55ca418d09b3afd8b30997bc5e7a405" -dependencies = [ - "backtrace", - "backtrace-ext", - "cfg-if", - "futures", - "indenter", - "lazy_static", - "miette-derive", - "owo-colors", - "regex", - "rustc_version 0.2.3", - "rustversion", - "serde_json", - "spin", - "strip-ansi-escapes", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "syn", - "terminal_size", - "textwrap", - "thiserror 2.0.3", - "trybuild", - "unicode-width 0.1.14", -] - -[[package]] -name = "miette-derive" -version = "7.1.0" -source = "git+https://github.com/0xPolygonMiden/miette?branch=pgackst-thiserror-2#eed93caaf55ca418d09b3afd8b30997bc5e7a405" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "miniz_oxide" version = "0.8.0" diff --git a/assembly/Cargo.toml b/assembly/Cargo.toml index 009234b07..86276f8f4 100644 --- a/assembly/Cargo.toml +++ b/assembly/Cargo.toml @@ -25,12 +25,7 @@ testing = ["dep:regex"] [dependencies] aho-corasick = { version = "1.1", default-features = false } lalrpop-util = { version = "0.20", default-features = false } -# miette = { path = "../../miden-miette/", version = "7.1", default-features = false, features = [ -# "fancy-no-syscall", -# "derive" -# ] } -# TODO: Temporary change to test updated miden-miette. -miette = { version = "7.1", git = "https://github.com/0xPolygonMiden/miette", branch = "pgackst-thiserror-2", default-features = false,features = [ +miette = { package = "miden-miette", version = "8.0", default-features = false, features = [ "fancy-no-syscall", "derive" ] } diff --git a/core/Cargo.toml b/core/Cargo.toml index 843a0e03f..e840b429b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -36,12 +36,7 @@ math = { package = "winter-math", version = "0.11", default-features = false } memchr = { version = "2.7", default-features = false } miden-crypto = { version = "0.13", default-features = false } miden-formatting = { version = "0.1", default-features = false } -# miette = { path = "../miden-miette/", version = "7.1", default-features = false, optional = true, features = [ -# "fancy-no-syscall", -# "derive" -# ] } -# TODO: Temporary change to test updated miden-miette. -miette = { version = "7.1", git = "https://github.com/0xPolygonMiden/miette", branch = "pgackst-thiserror-2", default-features = false, optional = true, features = [ +miette = { package = "miden-miette", version = "8.0", default-features = false, optional = true, features = [ "fancy-no-syscall", "derive" ] }