Auto merge of #1164 - RalfJung:cargo-install, r=RalfJung

rely on improved cargo install

`cargo install` will now update old versions, and not fail if things are up-to-date.
This commit is contained in:
bors 2020-01-31 11:07:24 +00:00
commit 75417e5a66
2 changed files with 2 additions and 2 deletions

View File

@ -30,7 +30,7 @@ install:
- rustup toolchain uninstall beta
- rustup update
# Install "master" toolchain
- cargo install rustup-toolchain-install-master & exit 0
- cargo install rustup-toolchain-install-master
# We need to install cargo here as well or else the DLL search path inside `cargo run`
# will be for the wrong toolchain. (On Unix, `./miri` takes care of this, but not here.)
- rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c rust-src -c rustc-dev -c cargo

View File

@ -37,7 +37,7 @@ before_script:
- rustup toolchain uninstall beta
- rustup update
# Install "master" toolchain
- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
- cargo install rustup-toolchain-install-master
- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src -c rustc-dev
- rustup default master
- rustc --version