Auto merge of #984 - RalfJung:rustup, r=RalfJung

Rustup for rustc-dev Fixes fallout from rust-lang/rust#64823
rust-lang · Oct 11, 2019 · ea6e02e · ea6e02e
2 parents 3899dce + c96efcd
commit ea6e02e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -28,7 +28,7 @@ install:
     - rustup update
     # Install "master" toolchain
     - cargo install rustup-toolchain-install-master & exit 0
-    - rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c cargo -c rust-src
+    - rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c rust-src -c rustc-dev
     - rustup default master
     - rustc --version
     - cargo --version

diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ before_script:
 - rustup update
 # Install "master" toolchain
 - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
-- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src
+- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src -c rustc-dev
 - rustup default master
 - rustc --version
 - cargo --version

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -31,8 +31,10 @@ Miri heavily relies on internal rustc interfaces to execute MIR.  Still, some
 things (like adding support for a new intrinsic or a shim for an external
 function being called) can be done by working just on the Miri side.
 
-To prepare, make sure you are using a nightly Rust compiler.  Then you should be
-able to just `cargo build` Miri.
+To prepare, make sure you are using a nightly Rust compiler.  You also need to
+have the `rust-src` and `rustc-dev` components installed, which you can add via
+`rustup component add rust-src rustc-dev`.  Then you should be able to just
+`cargo build` Miri.
 
 In case this fails, your nightly might be incompatible with Miri master.  The
 `rust-version` file contains the commit hash of rustc that Miri is currently
@@ -41,7 +43,7 @@ to wait for the next nightly to get released. You can also use
 [`rustup-toolchain-install-master`](https://github.com/kennytm/rustup-toolchain-install-master)
 to install that exact version of rustc as a toolchain:
 ```
-rustup-toolchain-install-master $(cat rust-version) -c rust-src
+rustup-toolchain-install-master $(cat rust-version) -c rust-src -c rustc-dev
 ```
 
 Another common problem is outdated dependencies: Miri does not come with a

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-2748a9fd93dd1a00a4521f4f16de5befbf77f6cd
+000d90b11f7be70ffb7812680f7abc6deb52ec88
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2748a9fd93dd1a00a4521f4f16de5befbf77f6cd
		000d90b11f7be70ffb7812680f7abc6deb52ec88