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

rustup, and now we also need to install llvm-tools

Fixes fallout from rust-lang/rust#72000

Author: bors

.appveyor.yml

@@ -30,7 +30,7 @@ install:
 - rustup update
 # Install "master" toolchain.
 - cargo install rustup-toolchain-install-master
-- rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c rust-src -c rustc-dev
+- rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c rust-src -c rustc-dev -c llvm-tools
 - rustup default master
 - rustc --version
 - cargo --version

.travis.yml

@@ -36,7 +36,7 @@ before_script:
 - rustup update
 # Install "master" toolchain.
 - cargo install rustup-toolchain-install-master
-- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src -c rustc-dev
+- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src -c rustc-dev -c llvm-tools
 - rustup default master
 - rustc --version
 - cargo --version

rust-version

@@ -1 +1 @@
-458a3e76294fd859fb037f425404180c91e14767
+c60b675e280fedded8d8487acd051cd342e486f2

rustup-toolchain

@@ -39,7 +39,7 @@ fi
 
 # Install and setup new toolchain.
 rustup toolchain uninstall miri
-rustup-toolchain-install-master -n miri -c rust-src -c rustc-dev -- "$NEW_COMMIT"
+rustup-toolchain-install-master -n miri -c rust-src -c rustc-dev -c llvm-tools -- "$NEW_COMMIT"
 rustup override set miri
 
 # Cleanup.