diff options
| author | bors <bors@rust-lang.org> | 2022-10-29 10:37:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-29 10:37:13 +0000 |
| commit | 18a23a5d03519eb5d4348a6d0e519b279af628ca (patch) | |
| tree | 2c5d80ef8e091a97b8961d96a317e3a0133eaa69 | |
| parent | e729db172ad15010244780f450639587c6748ee1 (diff) | |
| parent | 2a3a53b1514a5e87d4992175274d2599e63c0734 (diff) | |
| download | rust-18a23a5d03519eb5d4348a6d0e519b279af628ca.tar.gz rust-18a23a5d03519eb5d4348a6d0e519b279af628ca.zip | |
Auto merge of #2635 - RalfJung:rustup-managed-miri, r=RalfJung
explain how to go back to rustup-managed Miri Fixes https://github.com/rust-lang/miri/issues/2633
| -rw-r--r-- | src/tools/miri/CONTRIBUTING.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/miri/CONTRIBUTING.md b/src/tools/miri/CONTRIBUTING.md index b1e6b9c69d3..a2c86c3a8b2 100644 --- a/src/tools/miri/CONTRIBUTING.md +++ b/src/tools/miri/CONTRIBUTING.md @@ -138,6 +138,9 @@ There's a test for the cargo wrapper in the `test-cargo-miri` directory; run `./run-test.py` in there to execute it. Like `./miri test`, this respects the `MIRI_TEST_TARGET` environment variable to execute the test for another target. +Note that installing Miri like this will "take away" Miri management from `rustup`. +If you want to later go back to a rustup-installed Miri, run `rustup update`. + ### Using a modified standard library Miri re-builds the standard library into a custom sysroot, so it is fairly easy |