Auto merge of #98518 - RalfJung:miri, r=RalfJung

update Miri

Fixes https://github.com/rust-lang/rust/issues/98493 (this is a flaky test, that's why the toolstate already says Miri is fixed)
r? `@ghost` Cc `@rust-lang/miri`
This commit is contained in:
bors 2022-06-26 12:16:10 +00:00
commit 7125846d17
2 changed files with 5 additions and 19 deletions

View File

@ -2330,20 +2330,6 @@ dependencies = [
"topological-sort",
]
[[package]]
name = "measureme"
version = "9.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78f7a41bc6f856a2cf0e95094ad5121f82500e2d9a0f3c0171d98f6566d8117d"
dependencies = [
"log",
"memmap2",
"parking_lot 0.11.2",
"perf-event-open-sys",
"rustc-hash",
"smallvec",
]
[[package]]
name = "measureme"
version = "10.0.0"
@ -2442,7 +2428,7 @@ dependencies = [
"lazy_static",
"libc",
"log",
"measureme 9.1.2",
"measureme",
"rand 0.8.5",
"regex",
"rustc-workspace-hack",
@ -3652,7 +3638,7 @@ dependencies = [
"cstr",
"libc",
"libloading",
"measureme 10.0.0",
"measureme",
"rustc-demangle",
"rustc_ast",
"rustc_attr",
@ -3750,7 +3736,7 @@ dependencies = [
"indexmap",
"jobserver",
"libc",
"measureme 10.0.0",
"measureme",
"memmap2",
"parking_lot 0.11.2",
"rustc-hash",
@ -4306,7 +4292,7 @@ dependencies = [
name = "rustc_query_impl"
version = "0.0.0"
dependencies = [
"measureme 10.0.0",
"measureme",
"rustc-rayon-core",
"rustc_ast",
"rustc_data_structures",

@ -1 +1 @@
Subproject commit 655eed35b7ca7cae08f21ead6151b9dfb69794ff
Subproject commit 9e2dac4787e5470ecd9e245420e8da9528620edd