Skip to content

Commit dce4632

Browse files
committed
Rustup for rustc-dev
1 parent 5317efb commit dce4632

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ You can use [rustup-toolchain-install-master][rtim] to do that:
147147

148148
```bash
149149
cargo install rustup-toolchain-install-master
150-
rustup-toolchain-install-master -n master --force
150+
rustup-toolchain-install-master --force -n master -c rustc-dev
151151
rustup override set master
152152
cargo test
153153
```

appveyor.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ install:
1717
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
1818
- rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
1919
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
20-
- git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}' >rustc-hash.txt
21-
- set /p RUSTC_HASH=<rustc-hash.txt
2220
- del rust-toolchain
2321
- cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
24-
- rustup-toolchain-install-master %RUSTC_HASH% -f -n master
22+
- rustup-toolchain-install-master -f -n master -c rustc-dev
2523
- rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
2624
- rustup default master
2725
- set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin

setup-toolchain.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/bin/bash
22
# Set up the appropriate rustc toolchain
33

4-
cd "$(dirname "$0")"
4+
cd "$(dirname "$0")" || exit
55

66
if ! command -v rustup-toolchain-install-master > /dev/null; then
77
cargo install rustup-toolchain-install-master --debug
88
fi
99

10-
RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
11-
rustup-toolchain-install-master -f -n master "$RUSTC_HASH"
10+
rustup-toolchain-install-master -f -n master -c rustc-dev
1211
rustup override set master

0 commit comments

Comments
 (0)