diff options
| author | bors <bors@rust-lang.org> | 2021-05-31 22:33:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-31 22:33:54 +0000 |
| commit | d2091147b16a1e3e1f9a73b6ee29fbe941c8abce (patch) | |
| tree | 4a9362db5e20affd24dd367e965dea19848edc61 | |
| parent | 657bc01888e6297257655585f9c475a0801db6d2 (diff) | |
| parent | a258feb6eb2b069dcb36763513f9f2f98aee04eb (diff) | |
| download | rust-d2091147b16a1e3e1f9a73b6ee29fbe941c8abce.tar.gz rust-d2091147b16a1e3e1f9a73b6ee29fbe941c8abce.zip | |
Auto merge of #85866 - Aaron1011:miriup-const-err, r=RalfJung
Bump Miri for const_err changes Fixes https://github.com/rust-lang/rust/issues/85861 r? `@RalfJung`
| -rw-r--r-- | Cargo.lock | 5 | ||||
| m--------- | src/tools/miri | 16 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock index 954e2e90f3d..df7d8441941 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2135,9 +2135,9 @@ dependencies = [ [[package]] name = "measureme" -version = "9.1.1" +version = "9.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cf14eb7d2eea897d9949b68f19e165638755e3a1a3c0941b6b6c3e00141f2c" +checksum = "78f7a41bc6f856a2cf0e95094ad5121f82500e2d9a0f3c0171d98f6566d8117d" dependencies = [ "log", "memmap2", @@ -2289,6 +2289,7 @@ dependencies = [ "hex 0.4.2", "libc", "log", + "measureme", "rand 0.8.3", "rustc-workspace-hack", "rustc_version", diff --git a/src/tools/miri b/src/tools/miri -Subproject 4fa9363ebba236f7c29ae11180db6051d7d2ce3 +Subproject 453affaaa1762a065d2857970b8333017211208 |