diff --git a/Cargo.lock b/Cargo.lock index b9dcbc675..123d35b12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1020,7 +1020,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "miden-core", - "miden-miette", + "miette", "pretty_assertions", "regex", "rustc_version 0.4.1", @@ -1039,7 +1039,7 @@ dependencies = [ "memchr", "miden-crypto", "miden-formatting", - "miden-miette", + "miette", "num-derive", "num-traits", "parking_lot", @@ -1090,48 +1090,6 @@ dependencies = [ "winter-math", ] -[[package]] -name = "miden-miette" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c532250422d933f15b148fb81e4522a5d649c178ab420d0d596c86228da35570" -dependencies = [ - "backtrace", - "backtrace-ext", - "cfg-if", - "futures", - "indenter", - "lazy_static", - "miden-miette-derive", - "miden-thiserror", - "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", - "trybuild", - "unicode-width 0.1.14", -] - -[[package]] -name = "miden-miette-derive" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc759f0a2947acae217a2f32f722105cacc57d17d5f93bc16362142943a4edd" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "miden-processor" version = "0.11.0" @@ -1201,26 +1159,6 @@ dependencies = [ "winter-rand-utils", ] -[[package]] -name = "miden-thiserror" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183ff8de338956ecfde3a38573241eb7a6f3d44d73866c210e5629c07fa00253" -dependencies = [ - "miden-thiserror-impl", -] - -[[package]] -name = "miden-thiserror-impl" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee4176a0f2e7d29d2a8ee7e60b6deb14ce67a20e94c3e2c7275cdb8804e1862" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "miden-verifier" version = "0.11.0" @@ -1262,6 +1200,46 @@ 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 a912e4879..009234b07 100644 --- a/assembly/Cargo.toml +++ b/assembly/Cargo.toml @@ -25,7 +25,12 @@ testing = ["dep:regex"] [dependencies] aho-corasick = { version = "1.1", default-features = false } lalrpop-util = { version = "0.20", default-features = false } -miette = { package = "miden-miette", version = "7.1", default-features = false, features = [ +# 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 = [ "fancy-no-syscall", "derive" ] } diff --git a/core/Cargo.toml b/core/Cargo.toml index 89c861935..843a0e03f 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -36,7 +36,12 @@ 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 = { package = "miden-miette", version = "7.1", default-features = false, optional = true, features = [ +# 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 = [ "fancy-no-syscall", "derive" ] }