From dce46325b5845508054d934ebabbf862e32ee2e4 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Fri, 11 Oct 2019 15:53:55 +0700
Subject: [PATCH 1/2] Rustup for rustc-dev

---
 CONTRIBUTING.md    | 2 +-
 appveyor.yml       | 4 +---
 setup-toolchain.sh | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bf681a49b98d..fcf984ccaaf5 100644
--- 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 -n master --force
+rustup-toolchain-install-master --force -n master -c rustc-dev
 rustup override set master
 cargo test
 ```
diff --git a/appveyor.yml b/appveyor.yml
index eabb5ac5bf99..46614907ab5c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,11 +17,9 @@ install:
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
     - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-    - git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}' >rustc-hash.txt
-    - set /p RUSTC_HASH=<rustc-hash.txt
     - del rust-toolchain
     - cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
-    - rustup-toolchain-install-master %RUSTC_HASH% -f -n master
+    - rustup-toolchain-install-master -f -n master -c rustc-dev
     - 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
index c1c8366bf5e7..93b78bc21c23 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 # Set up the appropriate rustc toolchain
 
-cd "$(dirname "$0")"
+cd "$(dirname "$0")" || exit
 
 if ! command -v rustup-toolchain-install-master > /dev/null; then
   cargo install rustup-toolchain-install-master --debug
 fi
 
-RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
-rustup-toolchain-install-master -f -n master "$RUSTC_HASH"
+rustup-toolchain-install-master -f -n master -c rustc-dev
 rustup override set master

From 83f04442ecb50441dff764f9bb05ad89656891f1 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Sat, 12 Oct 2019 10:18:31 +0700
Subject: [PATCH 2/2] use git version

---
 appveyor.yml       | 2 +-
 setup-toolchain.sh | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 46614907ab5c..93bb8bde7d2e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ install:
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
     - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
     - del rust-toolchain
-    - cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
+    - 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 component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
     - rustup default master
diff --git a/setup-toolchain.sh b/setup-toolchain.sh
index 93b78bc21c23..012d26a1046b 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -4,7 +4,10 @@
 cd "$(dirname "$0")" || exit
 
 if ! command -v rustup-toolchain-install-master > /dev/null; then
-  cargo install rustup-toolchain-install-master --debug
+  cargo install \
+    --git https://github.com/kennytm/rustup-toolchain-install-master \
+    --bin rustup-toolchain-install-master \
+    --debug
 fi
 
 rustup-toolchain-install-master -f -n master -c rustc-dev