diff options
| author | bors <bors@rust-lang.org> | 2022-09-02 00:53:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-02 00:53:50 +0000 |
| commit | e4f049312c8547a493e618d00db7a346d35a2c98 (patch) | |
| tree | 2934a1a62ccb6ed16ad0f741b794465c8b29037a | |
| parent | 10706d62da83c4ec215165bc72df46219536648f (diff) | |
| parent | f76eac48665feaac77fd5cfe6528b403e842af8f (diff) | |
| download | rust-e4f049312c8547a493e618d00db7a346d35a2c98.tar.gz rust-e4f049312c8547a493e618d00db7a346d35a2c98.zip | |
Auto merge of #101248 - RalfJung:miri, r=RalfJung
update Miri r? `@ghost` Fixes https://github.com/rust-lang/rust/issues/101067
| -rw-r--r-- | Cargo.lock | 38 | ||||
| m--------- | src/tools/miri | 18 |
2 files changed, 15 insertions, 41 deletions
diff --git a/Cargo.lock b/Cargo.lock index f83678f0ca6..8ae166de1c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1037,16 +1037,6 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" -dependencies = [ - "quote", - "syn", -] - -[[package]] name = "curl" version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2294,6 +2284,7 @@ dependencies = [ "getrandom 0.2.0", "lazy_static", "libc", + "libloading", "log", "measureme", "rand 0.8.5", @@ -2473,15 +2464,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" [[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - -[[package]] name = "owo-colors" version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2722,18 +2704,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "pretty_assertions" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563" -dependencies = [ - "ansi_term", - "ctor", - "diff", - "output_vt100", -] - -[[package]] name = "pretty_env_logger" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5135,14 +5105,16 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] name = "ui_test" -version = "0.1.0" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d1f546a5883ae78da735bba529ec1116661e2f73582f23920d994dc97da3a22" dependencies = [ "cargo_metadata 0.15.0", "color-eyre", "colored", "crossbeam", + "diff", "lazy_static", - "pretty_assertions", "regex", "rustc_version", "serde", diff --git a/src/tools/miri b/src/tools/miri -Subproject ab88e64b152d3704c35db96dbbc6efaaed67773 +Subproject 8c8b479be723fb103b0b1203faf9246a3f58725 |