From 6693199c0b4d7e3d62d10e60caa1ae5858bf2f4c Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Sun, 13 Oct 2019 07:46:14 -0700
Subject: [PATCH 1/3] Bump compiletest

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 73568c8a445..1f4a61afd8f 100644
--- 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"] }

From c56784e2b85032245353eaa2ce9ceb48445b3e3d Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Mon, 14 Oct 2019 00:47:36 +0700
Subject: [PATCH 2/3] Use my RTIM fork

---
 setup-toolchain.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup-toolchain.sh b/setup-toolchain.sh
index 012d26a1046..5e34fb3756f 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -5,7 +5,8 @@ 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

From 974a05b806954ebdc6640b7ef539667bd7baca56 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Mon, 14 Oct 2019 10:25:05 +0700
Subject: [PATCH 3/3] rustc-dev has been temporarily removed

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fcf984ccaaf..663b4042b42 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 --force -n master -c rustc-dev
+rustup-toolchain-install-master --force -n master
 rustup override set master
 cargo test
 ```
diff --git a/appveyor.yml b/appveyor.yml
index 93bb8bde7d2..62fd7825ed9 100644
--- 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
index 5e34fb3756f..49278a9137d 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -11,5 +11,5 @@ if ! command -v rustup-toolchain-install-master > /dev/null; then
     --debug
 fi
 
-rustup-toolchain-install-master -f -n master -c rustc-dev
+rustup-toolchain-install-master -f -n master
 rustup override set master