From 1ec87283259b38d0e729495953dddc206d74a52f Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 14 Aug 2018 00:54:04 +0200 Subject: [PATCH] document and fully use rust-toolchain file --- .travis.yml | 2 ++ README.md | 27 ++++----------------------- rust-toolchain | 2 +- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index d05661a48487..bded347b825a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ before_script: # mac os weirdness (https://github.com/travis-ci/travis-ci/issues/6307) - curl -sSL https://rvm.io/mpapis.asc | gpg --import - - rvm get stable +# in a cronjob, use latest (not pinned) nightly +- if [ "$TRAVIS_EVENT_TYPE" = cron ]; then rustup override set nightly; fi # actual travis code - export PATH=$HOME/.local/bin:$PATH - rustup target add i686-unknown-linux-gnu diff --git a/README.md b/README.md index 8c476270db1a..d14467be9144 100644 --- a/README.md +++ b/README.md @@ -5,35 +5,16 @@ An experimental interpreter for [Rust][rust]'s [mid-level intermediate representation][mir] (MIR). This project began as part of my work for the undergraduate research course at the [University of Saskatchewan][usask]. -## Installing Rust - -I recommend that you install [rustup][rustup] and then use it to install the -current Rust nightly version: - -```sh -rustup update nightly -``` - -You should also make `nightly` the default version for your Miri directory by -running the following command while you're in it. If you don't do this, you can -run the later `cargo` commands by using `cargo +nightly` instead. - -```sh -rustup override add nightly -``` - ## Building Miri +I recommend that you install [rustup][rustup] to obtain Rust. miri comes with a +`rust-toolchain` file so rustup will automatically pick a suitable nightly +version. Then all you have to do is: + ```sh cargo build ``` -If Miri fails to build, it's likely because a change in the latest nightly -compiler broke it. You could try an older nightly with `rustup update -nightly-` where `` is a few days or weeks ago, e.g. `2016-05-20` for -May 20th. Otherwise, you could notify me in an issue or on IRC. Or, if you know -how to fix it, you could send a PR. :smile: - ## Running tests ```sh diff --git a/rust-toolchain b/rust-toolchain index bf867e0ae5b6..8e23548106cb 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly +nightly-2018-08-03