Skip to content

Commit abda1a8

Browse files
committed
rename rust-toolchain to rust-version; add note to README about usage
1 parent 3dcf655 commit abda1a8

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ before_script:
1818
if [ "$TRAVIS_EVENT_TYPE" = cron ]; then
1919
RUST_TOOLCHAIN=nightly
2020
else
21-
RUST_TOOLCHAIN=$(cat rust-toolchain)
21+
RUST_TOOLCHAIN=$(cat rust-version)
2222
fi
23-
- rm rust-toolchain
2423
# install Rust
2524
- curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN"
2625
- export PATH=$HOME/.cargo/bin:$PATH

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ with Miri.
8484

8585
## Using Rustup To Specify a Specific Nightly
8686

87-
To target a specific nightly, modify the above instructions as follows.
87+
To target a specific nightly, modify the above instructions as follows. It is recommended
88+
to use the nightly specified in the `rust-version` file in this repo, since that is the
89+
most recent nightly supported by Miri.
8890

8991
1. Install Miri using `cargo +nightly-2018-10-15 install --all-features --path .`,
9092
with the date replaced as appropriate.

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ branches:
1616
install:
1717
# install Rust
1818
- set PATH=C:\Program Files\Git\mingw64\bin;C:\msys64\mingw%MSYS2_BITS%\bin;%PATH%
19-
- set /p RUST_TOOLCHAIN=<rust-toolchain
19+
- set /p RUST_TOOLCHAIN=<rust-version
2020
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
2121
- rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_TOOLCHAIN%
2222
- set PATH=%USERPROFILE%\.cargo\bin;%PATH%
File renamed without changes.

0 commit comments

Comments
 (0)