diff --git a/Cargo.lock b/Cargo.lock index 9a8d9d40b6e45..17c19c8d99cfb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,6 +14,15 @@ dependencies = [ "rustc-std-workspace-core", ] +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli 0.26.1", +] + [[package]] name = "adler" version = "0.2.3" @@ -24,6 +33,12 @@ dependencies = [ "rustc-std-workspace-core", ] +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "ahash" version = "0.7.4" @@ -170,6 +185,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line 0.17.0", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide 0.5.3", + "object 0.29.0", + "rustc-demangle", +] + [[package]] name = "bitflags" version = "1.2.1" @@ -693,6 +723,33 @@ dependencies = [ "rustc-semver", ] +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + [[package]] name = "colored" version = "2.0.0" @@ -1239,6 +1296,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -1279,7 +1346,7 @@ dependencies = [ "crc32fast", "libc", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.4.0", ] [[package]] @@ -1820,6 +1887,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" version = "1.8.2" @@ -2374,12 +2447,21 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" dependencies = [ - "adler", + "adler 0.2.3", "compiler_builtins", "rustc-std-workspace-alloc", "rustc-std-workspace-core", ] +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler 1.0.2", +] + [[package]] name = "mio" version = "0.7.14" @@ -2625,6 +2707,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "owo-colors" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b" + [[package]] name = "packed_simd_2" version = "0.3.4" @@ -4971,7 +5059,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" name = "std" version = "0.0.0" dependencies = [ - "addr2line", + "addr2line 0.16.0", "alloc", "cfg-if 0.1.10", "compiler_builtins", @@ -4981,7 +5069,7 @@ dependencies = [ "hashbrown 0.12.0", "hermit-abi 0.2.0", "libc", - "miniz_oxide", + "miniz_oxide 0.4.0", "object 0.26.2", "panic_abort", "panic_unwind", @@ -5372,6 +5460,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + [[package]] name = "tracing-log" version = "0.1.2" @@ -5450,6 +5548,7 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" name = "ui_test" version = "0.1.0" dependencies = [ + "color-eyre", "colored", "crossbeam", "lazy_static", diff --git a/src/tools/miri b/src/tools/miri index cde87d18239b8..416cddb2516de 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit cde87d18239b8d9afa9c6bf1051bf5573dbf326e +Subproject commit 416cddb2516dea056bf6269eaaa5ba4d24ad0832 diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 55cf3fee9bf11..ea7eff1a4148e 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -20,6 +20,7 @@ const LICENSES: &[&str] = &[ "Unlicense OR MIT", "0BSD OR MIT OR Apache-2.0", // adler license "Zlib OR Apache-2.0 OR MIT", // tinyvec + "MIT OR Zlib OR Apache-2.0", // miniz_oxide ]; /// These are exceptions to Rust's permissive licensing policy, and