Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c50c62d

Browse files
committedMar 17, 2023
Auto merge of #109241 - saethlin:miri, r=oli-obk
update Miri r? `@oli-obk`
2 parents 2d64f22 + 3831a25 commit c50c62d

File tree

111 files changed

+3785
-203
lines changed

Some content is hidden

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

111 files changed

+3785
-203
lines changed
 

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ jobs:
5454
# contains package information of crates installed via `cargo install`.
5555
~/.cargo/.crates.toml
5656
~/.cargo/.crates2.json
57-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
58-
restore-keys: ${{ runner.os }}-cargo
57+
key: ${{ runner.os }}-cargo-reset20230315-${{ hashFiles('**/Cargo.lock') }}
58+
restore-keys: ${{ runner.os }}-cargo-reset20230315
5959

6060
- name: Install rustup-toolchain-install-master
6161
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
@@ -106,8 +106,8 @@ jobs:
106106
# contains package information of crates installed via `cargo install`.
107107
~/.cargo/.crates.toml
108108
~/.cargo/.crates2.json
109-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
110-
restore-keys: ${{ runner.os }}-cargo
109+
key: ${{ runner.os }}-cargo-reset20230315-${{ hashFiles('**/Cargo.lock') }}
110+
restore-keys: ${{ runner.os }}-cargo-reset20230315
111111

112112
- name: Install rustup-toolchain-install-master
113113
if: ${{ steps.cache.outputs.cache-hit != 'true' }}

‎src/tools/miri/CONTRIBUTING.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,15 @@ development version of Miri using
129129
./miri install
130130
```
131131

132-
and then you can use it as if it was installed by `rustup`. Make sure you use
133-
the same toolchain when calling `cargo miri` that you used when installing Miri!
134-
Usually this means you have to write `cargo +miri miri ...` to select the `miri`
135-
toolchain that was installed by `./miri toolchain`.
132+
and then you can use it as if it was installed by `rustup` as a component of the
133+
`miri` toolchain. Note that the `miri` and `cargo-miri` executables are placed
134+
in the `miri` toolchain's sysroot to prevent conflicts with other toolchains.
135+
The Miri binaries in the `cargo` bin directory (usually `~/.cargo/bin`) are managed by rustup.
136136

137137
There's a test for the cargo wrapper in the `test-cargo-miri` directory; run
138138
`./run-test.py` in there to execute it. Like `./miri test`, this respects the
139139
`MIRI_TEST_TARGET` environment variable to execute the test for another target.
140140

141-
Note that installing Miri like this will "take away" Miri management from `rustup`.
142-
If you want to later go back to a rustup-installed Miri, run `rustup update`.
143-
144141
### Using a modified standard library
145142

146143
Miri re-builds the standard library into a custom sysroot, so it is fairly easy

0 commit comments

Comments
 (0)
Please sign in to comment.