Skip to content

Commit 7125846

Browse files
committed
Auto merge of #98518 - RalfJung:miri, r=RalfJung
update Miri Fixes #98493 (this is a flaky test, that's why the toolstate already says Miri is fixed) r? `@ghost` Cc `@rust-lang/miri`
2 parents 0e1a6fb + 61a986a commit 7125846

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

Cargo.lock

+4-18
Original file line numberDiff line numberDiff line change
@@ -2330,20 +2330,6 @@ dependencies = [
23302330
"topological-sort",
23312331
]
23322332

2333-
[[package]]
2334-
name = "measureme"
2335-
version = "9.1.2"
2336-
source = "registry+https://github.com/rust-lang/crates.io-index"
2337-
checksum = "78f7a41bc6f856a2cf0e95094ad5121f82500e2d9a0f3c0171d98f6566d8117d"
2338-
dependencies = [
2339-
"log",
2340-
"memmap2",
2341-
"parking_lot 0.11.2",
2342-
"perf-event-open-sys",
2343-
"rustc-hash",
2344-
"smallvec",
2345-
]
2346-
23472333
[[package]]
23482334
name = "measureme"
23492335
version = "10.0.0"
@@ -2442,7 +2428,7 @@ dependencies = [
24422428
"lazy_static",
24432429
"libc",
24442430
"log",
2445-
"measureme 9.1.2",
2431+
"measureme",
24462432
"rand 0.8.5",
24472433
"regex",
24482434
"rustc-workspace-hack",
@@ -3652,7 +3638,7 @@ dependencies = [
36523638
"cstr",
36533639
"libc",
36543640
"libloading",
3655-
"measureme 10.0.0",
3641+
"measureme",
36563642
"rustc-demangle",
36573643
"rustc_ast",
36583644
"rustc_attr",
@@ -3750,7 +3736,7 @@ dependencies = [
37503736
"indexmap",
37513737
"jobserver",
37523738
"libc",
3753-
"measureme 10.0.0",
3739+
"measureme",
37543740
"memmap2",
37553741
"parking_lot 0.11.2",
37563742
"rustc-hash",
@@ -4306,7 +4292,7 @@ dependencies = [
43064292
name = "rustc_query_impl"
43074293
version = "0.0.0"
43084294
dependencies = [
4309-
"measureme 10.0.0",
4295+
"measureme",
43104296
"rustc-rayon-core",
43114297
"rustc_ast",
43124298
"rustc_data_structures",

src/tools/miri

Submodule miri updated 51 files

0 commit comments

Comments
 (0)