rename `rust-toolchain` to `rust-version`; add note to README about usage

diff --git a/.travis.yml b/.travis.yml
index d2315c7e9538e5c8081d7a390a607d6f3094e7da..095af11627fac47e7647f2b5cd4b5a2f70a46a59 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,8 @@ before_script:
   if [ "$TRAVIS_EVENT_TYPE" = cron ]; then
     RUST_TOOLCHAIN=nightly
   else
-    RUST_TOOLCHAIN=$(cat rust-toolchain)
+    RUST_TOOLCHAIN=$(cat rust-version)
   fi
-- rm rust-toolchain
 # install Rust
 - curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN"
 - export PATH=$HOME/.cargo/bin:$PATH

diff --git a/README.md b/README.md
index e5c2850ef3eb1b026702cc92a8407cb78a581767..76127d8b62a98490c06a66d66e56e2d2022859fe 100644 (file)
--- a/README.md
+++ b/README.md
@@ -84,7 +84,9 @@ with Miri.
 
 ## Using Rustup To Specify a Specific Nightly
 
-To target a specific nightly, modify the above instructions as follows.
+To target a specific nightly, modify the above instructions as follows. It is recommended
+to use the nightly specified in the `rust-version` file in this repo, since that is the
+most recent nightly supported by Miri.
 
 1. Install Miri using `cargo +nightly-2018-10-15 install --all-features --path .`,
 with the date replaced as appropriate.

diff --git a/appveyor.yml b/appveyor.yml
index 4614891a31297b3450204826000a5d13155a9f37..cf578120c9ddf5937f1cd90db3362743c97b80dc 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,7 @@ branches:
 install:
     # install Rust
     - set PATH=C:\Program Files\Git\mingw64\bin;C:\msys64\mingw%MSYS2_BITS%\bin;%PATH%
-    - set /p RUST_TOOLCHAIN=<rust-toolchain
+    - set /p RUST_TOOLCHAIN=<rust-version
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_TOOLCHAIN%
     - set PATH=%USERPROFILE%\.cargo\bin;%PATH%

diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644 (file)
index cc0787f..0000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-2018-10-22

diff --git a/rust-version b/rust-version
new file mode 100644 (file)
index 0000000..cc0787f
--- /dev/null
+++ b/rust-version
@@ -0,0 +1 @@
+nightly-2018-10-22