Skip to content

Commit 242fb92

Browse files
fmeasefmease
authored
Rollup merge of #124727 - RalfJung:miri-sync, r=RalfJung
Miri subtree update r? `@ghost`
2 parents 0fb7ede + b5051c5 commit 242fb92

File tree

106 files changed

+935
-720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+935
-720
lines changed

‎Cargo.lock

+79-9
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,28 @@ dependencies = [
512512
"windows-targets 0.52.4",
513513
]
514514

515+
[[package]]
516+
name = "chrono-tz"
517+
version = "0.9.0"
518+
source = "registry+https://github.com/rust-lang/crates.io-index"
519+
checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
520+
dependencies = [
521+
"chrono",
522+
"chrono-tz-build",
523+
"phf 0.11.2",
524+
]
525+
526+
[[package]]
527+
name = "chrono-tz-build"
528+
version = "0.3.0"
529+
source = "registry+https://github.com/rust-lang/crates.io-index"
530+
checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
531+
dependencies = [
532+
"parse-zoneinfo",
533+
"phf 0.11.2",
534+
"phf_codegen 0.11.2",
535+
]
536+
515537
[[package]]
516538
name = "cipher"
517539
version = "0.4.4"
@@ -2318,8 +2340,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
23182340
checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
23192341
dependencies = [
23202342
"log",
2321-
"phf",
2322-
"phf_codegen",
2343+
"phf 0.10.1",
2344+
"phf_codegen 0.10.0",
23232345
"string_cache",
23242346
"string_cache_codegen",
23252347
"tendril",
@@ -2480,6 +2502,7 @@ version = "0.1.0"
24802502
dependencies = [
24812503
"aes",
24822504
"chrono",
2505+
"chrono-tz",
24832506
"colored",
24842507
"ctrlc",
24852508
"directories",
@@ -2835,6 +2858,15 @@ dependencies = [
28352858
"windows-targets 0.48.5",
28362859
]
28372860

2861+
[[package]]
2862+
name = "parse-zoneinfo"
2863+
version = "0.3.1"
2864+
source = "registry+https://github.com/rust-lang/crates.io-index"
2865+
checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
2866+
dependencies = [
2867+
"regex",
2868+
]
2869+
28382870
[[package]]
28392871
name = "pathdiff"
28402872
version = "0.2.1"
@@ -2907,7 +2939,16 @@ version = "0.10.1"
29072939
source = "registry+https://github.com/rust-lang/crates.io-index"
29082940
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
29092941
dependencies = [
2910-
"phf_shared",
2942+
"phf_shared 0.10.0",
2943+
]
2944+
2945+
[[package]]
2946+
name = "phf"
2947+
version = "0.11.2"
2948+
source = "registry+https://github.com/rust-lang/crates.io-index"
2949+
checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
2950+
dependencies = [
2951+
"phf_shared 0.11.2",
29112952
]
29122953

29132954
[[package]]
@@ -2916,8 +2957,18 @@ version = "0.10.0"
29162957
source = "registry+https://github.com/rust-lang/crates.io-index"
29172958
checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
29182959
dependencies = [
2919-
"phf_generator",
2920-
"phf_shared",
2960+
"phf_generator 0.10.0",
2961+
"phf_shared 0.10.0",
2962+
]
2963+
2964+
[[package]]
2965+
name = "phf_codegen"
2966+
version = "0.11.2"
2967+
source = "registry+https://github.com/rust-lang/crates.io-index"
2968+
checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
2969+
dependencies = [
2970+
"phf_generator 0.11.2",
2971+
"phf_shared 0.11.2",
29212972
]
29222973

29232974
[[package]]
@@ -2926,7 +2977,17 @@ version = "0.10.0"
29262977
source = "registry+https://github.com/rust-lang/crates.io-index"
29272978
checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
29282979
dependencies = [
2929-
"phf_shared",
2980+
"phf_shared 0.10.0",
2981+
"rand",
2982+
]
2983+
2984+
[[package]]
2985+
name = "phf_generator"
2986+
version = "0.11.2"
2987+
source = "registry+https://github.com/rust-lang/crates.io-index"
2988+
checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
2989+
dependencies = [
2990+
"phf_shared 0.11.2",
29302991
"rand",
29312992
]
29322993

@@ -2939,6 +3000,15 @@ dependencies = [
29393000
"siphasher",
29403001
]
29413002

3003+
[[package]]
3004+
name = "phf_shared"
3005+
version = "0.11.2"
3006+
source = "registry+https://github.com/rust-lang/crates.io-index"
3007+
checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
3008+
dependencies = [
3009+
"siphasher",
3010+
]
3011+
29423012
[[package]]
29433013
name = "pin-project-lite"
29443014
version = "0.2.14"
@@ -5285,7 +5355,7 @@ dependencies = [
52855355
"new_debug_unreachable",
52865356
"once_cell",
52875357
"parking_lot",
5288-
"phf_shared",
5358+
"phf_shared 0.10.0",
52895359
"precomputed-hash",
52905360
"serde",
52915361
]
@@ -5296,8 +5366,8 @@ version = "0.5.2"
52965366
source = "registry+https://github.com/rust-lang/crates.io-index"
52975367
checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
52985368
dependencies = [
5299-
"phf_generator",
5300-
"phf_shared",
5369+
"phf_generator 0.10.0",
5370+
"phf_shared 0.10.0",
53015371
"proc-macro2",
53025372
"quote",
53035373
]

‎src/tools/miri/.github/workflows/ci.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
# over time).
4646
- name: Add cache for cargo
4747
id: cache
48-
uses: actions/cache@v3
48+
uses: actions/cache@v4
4949
with:
5050
path: |
5151
# Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>.
@@ -61,7 +61,7 @@ jobs:
6161
restore-keys: cargo-${{ runner.os }}-reset20240425
6262

6363
- name: Install tools
64-
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
64+
if: steps.cache.outputs.cache-hit != 'true'
6565
run: cargo install -f rustup-toolchain-install-master hyperfine
6666

6767
- name: Install miri toolchain
@@ -78,6 +78,12 @@ jobs:
7878
rustc -Vv
7979
cargo -V
8080
81+
# The `style` job only runs on Linux; this makes sure the Windows-host-specific
82+
# code is also covered by clippy.
83+
- name: Check clippy
84+
if: matrix.os == 'windows-latest'
85+
run: ./miri clippy -- -D warnings
86+
8187
- name: Test Miri
8288
run: ./ci/ci.sh
8389

@@ -95,7 +101,7 @@ jobs:
95101
# over time).
96102
- name: Add cache for cargo
97103
id: cache
98-
uses: actions/cache@v3
104+
uses: actions/cache@v4
99105
with:
100106
path: |
101107
# Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>.
@@ -111,7 +117,7 @@ jobs:
111117
restore-keys: cargo-${{ runner.os }}-reset20240331
112118

113119
- name: Install rustup-toolchain-install-master
114-
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
120+
if: steps.cache.outputs.cache-hit != 'true'
115121
run: cargo install -f rustup-toolchain-install-master
116122

117123
- name: Install "master" toolchain

0 commit comments

Comments
 (0)