Skip to content

Commit 1aa6f70

Browse files
authored
Rollup merge of #139573 - RalfJung:miri-sync, r=RalfJung
Miri subtree update r? `@ghost`
2 parents 704d301 + f0fb21e commit 1aa6f70

37 files changed

+824
-827
lines changed

Diff for: Cargo.lock

+35-26
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ dependencies = [
379379
name = "cargo-miri"
380380
version = "0.1.0"
381381
dependencies = [
382-
"cargo_metadata 0.18.1",
382+
"cargo_metadata 0.19.2",
383383
"directories",
384384
"rustc-build-sysroot",
385385
"rustc_tools_util 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1012,11 +1012,11 @@ dependencies = [
10121012

10131013
[[package]]
10141014
name = "directories"
1015-
version = "5.0.1"
1015+
version = "6.0.0"
10161016
source = "registry+https://github.com/rust-lang/crates.io-index"
1017-
checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
1017+
checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
10181018
dependencies = [
1019-
"dirs-sys",
1019+
"dirs-sys 0.5.0",
10201020
]
10211021

10221022
[[package]]
@@ -1025,7 +1025,7 @@ version = "5.0.1"
10251025
source = "registry+https://github.com/rust-lang/crates.io-index"
10261026
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
10271027
dependencies = [
1028-
"dirs-sys",
1028+
"dirs-sys 0.4.1",
10291029
]
10301030

10311031
[[package]]
@@ -1046,18 +1046,30 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
10461046
dependencies = [
10471047
"libc",
10481048
"option-ext",
1049-
"redox_users",
1049+
"redox_users 0.4.6",
10501050
"windows-sys 0.48.0",
10511051
]
10521052

1053+
[[package]]
1054+
name = "dirs-sys"
1055+
version = "0.5.0"
1056+
source = "registry+https://github.com/rust-lang/crates.io-index"
1057+
checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
1058+
dependencies = [
1059+
"libc",
1060+
"option-ext",
1061+
"redox_users 0.5.0",
1062+
"windows-sys 0.59.0",
1063+
]
1064+
10531065
[[package]]
10541066
name = "dirs-sys-next"
10551067
version = "0.1.2"
10561068
source = "registry+https://github.com/rust-lang/crates.io-index"
10571069
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
10581070
dependencies = [
10591071
"libc",
1060-
"redox_users",
1072+
"redox_users 0.4.6",
10611073
"winapi",
10621074
]
10631075

@@ -2211,20 +2223,6 @@ dependencies = [
22112223
"digest",
22122224
]
22132225

2214-
[[package]]
2215-
name = "measureme"
2216-
version = "11.0.1"
2217-
source = "registry+https://github.com/rust-lang/crates.io-index"
2218-
checksum = "dfa4a40f09af7aa6faef38285402a78847d0d72bf8827006cd2a332e1e6e4a8d"
2219-
dependencies = [
2220-
"log",
2221-
"memmap2",
2222-
"parking_lot",
2223-
"perf-event-open-sys",
2224-
"rustc-hash 1.1.0",
2225-
"smallvec",
2226-
]
2227-
22282226
[[package]]
22292227
name = "measureme"
22302228
version = "12.0.1"
@@ -2322,15 +2320,15 @@ dependencies = [
23222320
"libc",
23232321
"libffi",
23242322
"libloading",
2325-
"measureme 11.0.1",
2323+
"measureme",
23262324
"rand 0.9.0",
23272325
"regex",
23282326
"rustc_version",
23292327
"smallvec",
23302328
"tempfile",
23312329
"tikv-jemalloc-sys",
23322330
"ui_test",
2333-
"windows-sys 0.52.0",
2331+
"windows-sys 0.59.0",
23342332
]
23352333

23362334
[[package]]
@@ -3029,6 +3027,17 @@ dependencies = [
30293027
"thiserror 1.0.69",
30303028
]
30313029

3030+
[[package]]
3031+
name = "redox_users"
3032+
version = "0.5.0"
3033+
source = "registry+https://github.com/rust-lang/crates.io-index"
3034+
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
3035+
dependencies = [
3036+
"getrandom 0.2.15",
3037+
"libredox",
3038+
"thiserror 2.0.12",
3039+
]
3040+
30323041
[[package]]
30333042
name = "regex"
30343043
version = "1.11.1"
@@ -3469,7 +3478,7 @@ dependencies = [
34693478
"gimli 0.31.1",
34703479
"itertools",
34713480
"libc",
3472-
"measureme 12.0.1",
3481+
"measureme",
34733482
"object 0.36.7",
34743483
"rustc-demangle",
34753484
"rustc_abi",
@@ -3584,7 +3593,7 @@ dependencies = [
35843593
"indexmap",
35853594
"jobserver",
35863595
"libc",
3587-
"measureme 12.0.1",
3596+
"measureme",
35883597
"memmap2",
35893598
"parking_lot",
35903599
"portable-atomic",
@@ -4344,7 +4353,7 @@ dependencies = [
43444353
name = "rustc_query_impl"
43454354
version = "0.0.0"
43464355
dependencies = [
4347-
"measureme 12.0.1",
4356+
"measureme",
43484357
"rustc_data_structures",
43494358
"rustc_hashes",
43504359
"rustc_hir",

0 commit comments

Comments
 (0)