Auto merge of #4663 - lzutao:rustup, r=phansch

Rustup changelog: none Suppresses #4662. r? @phansch
rust-lang · Oct 14, 2019 · c40d7db · c40d7db
2 parents a865d0a + 974a05b
commit c40d7db
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -147,7 +147,7 @@ You can use [rustup-toolchain-install-master][rtim] to do that:
 
 ```bash
 cargo install rustup-toolchain-install-master
-rustup-toolchain-install-master --force -n master -c rustc-dev
+rustup-toolchain-install-master --force -n master
 rustup override set master
 cargo test
 ```

diff --git a/Cargo.toml b/Cargo.toml
@@ -46,7 +46,7 @@ rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"}
 
 [dev-dependencies]
 cargo_metadata = "0.8.0"
-compiletest_rs = { version = "0.3.23", features = ["tmp"] }
+compiletest_rs = { version = "0.3.24", features = ["tmp"] }
 lazy_static = "1.0"
 clippy-mini-macro-test = { version = "0.2", path = "mini-macro" }
 serde = { version = "1.0", features = ["derive"] }

diff --git a/appveyor.yml b/appveyor.yml
@@ -19,7 +19,7 @@ install:
     - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
     - del rust-toolchain
     - cargo install --git https://github.com/kennytm/rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
-    - rustup-toolchain-install-master -f -n master -c rustc-dev
+    - rustup-toolchain-install-master -f -n master
     - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
     - rustup default master
     - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin

diff --git a/setup-toolchain.sh b/setup-toolchain.sh
@@ -5,10 +5,11 @@ cd "$(dirname "$0")" || exit
 
 if ! command -v rustup-toolchain-install-master > /dev/null; then
   cargo install \
-    --git https://github.com/kennytm/rustup-toolchain-install-master \
+    --git https://github.com/lzutao/rustup-toolchain-install-master \
+    --rev c44dbf920b644000ac3ba01184cbb1a01bb91519 \
     --bin rustup-toolchain-install-master \
     --debug
 fi
 
-rustup-toolchain-install-master -f -n master -c rustc-dev
+rustup-toolchain-install-master -f -n master
 rustup override set master