Skip to content

Commit 0347e1b

Browse files
committed
Auto merge of #867 - RalfJung:readme, r=RalfJung
README: move CI remark down to CI section
2 parents effffd8 + 6902461 commit 0347e1b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cache:
1818

1919
install:
2020
# Install Rust
21-
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
21+
- curl -sSf --retry 3 -o rustup-init.exe https://win.rustup.rs/
2222
- rustup-init.exe -y --default-host %TARGET% --default-toolchain stable
2323
- set PATH=%USERPROFILE%\.cargo\bin;%PATH%
2424
# Install "master" toolchain

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ Now you can run your project in Miri:
7373
3. If you have a binary project, you can run it through Miri using `cargo miri run`.
7474

7575
The first time you run Miri, it will perform some extra setup and install some
76-
dependencies. It will ask you for confirmation before installing anything. If
77-
you run Miri on CI, run `cargo miri setup` to avoid getting interactive
78-
questions.
76+
dependencies. It will ask you for confirmation before installing anything.
7977

8078
You can pass arguments to Miri after the first `--`, and pass arguments to the
8179
interpreted program or test suite after the second `--`. For example, `cargo
@@ -115,6 +113,9 @@ cargo miri setup
115113
cargo miri test -- -- -Zunstable-options --exclude-should-panic
116114
```
117115

116+
We use `cargo miri setup` to avoid getting interactive questions about the extra
117+
setup needed for Miri.
118+
118119
### Common Problems
119120

120121
When using the above instructions, you may encounter a number of confusing compiler

0 commit comments

Comments
 (0)