diff options
| author | bors <bors@rust-lang.org> | 2019-10-14 17:00:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-14 17:00:46 +0000 |
| commit | c40d7db6ed04ce0a2f8ce5b0e057615850d69f48 (patch) | |
| tree | 2ef234c098282e841ee726a5f97739c0855f30e8 | |
| parent | a865d0ad736d76281fe47dcdf8c0c095e77edaf4 (diff) | |
| parent | 974a05b806954ebdc6640b7ef539667bd7baca56 (diff) | |
| download | rust-c40d7db6ed04ce0a2f8ce5b0e057615850d69f48.tar.gz rust-c40d7db6ed04ce0a2f8ce5b0e057615850d69f48.zip | |
Auto merge of #4663 - lzutao:rustup, r=phansch
Rustup changelog: none Suppresses #4662. r? @phansch
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rwxr-xr-x | setup-toolchain.sh | 5 |
4 files changed, 6 insertions, 5 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/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"] } 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 012d26a1046..49278a9137d 100755 --- 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 |