From 8d38a07fb6e90f7f312165e8ae8eb0f63bdf21af Mon Sep 17 00:00:00 2001 From: flip1995 Date: Thu, 24 Oct 2019 14:03:24 +0200 Subject: [PATCH] Revert "rustc-dev has been temporarily removed" This reverts commit 974a05b806954ebdc6640b7ef539667bd7baca56. --- 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 663b4042b42..fcf984ccaaf 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 +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 829c781eb08..6168d66b155 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - del rust-toolchain - cargo install -Z install-upgrade rustup-toolchain-install-master - - rustup-toolchain-install-master -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 aac18e37946..89de40d40bc 100755 --- a/setup-toolchain.sh +++ b/setup-toolchain.sh @@ -9,5 +9,5 @@ if [[ "$CI" == true ]] || ! command -v rustup-toolchain-install-master > /dev/nu cargo install -Z install-upgrade rustup-toolchain-install-master --bin rustup-toolchain-install-master fi -rustup-toolchain-install-master -f -n master +rustup-toolchain-install-master -f -n master -c rustc-dev rustup override set master