Auto merge of #859 - RalfJung:cargo, r=RalfJung

travis: do not install cargo from master

This tests the rpath hackery in `./miri`.
This commit is contained in:
bors 2019-08-15 20:51:52 +00:00
commit bfd6181d34

View File

@ -33,9 +33,10 @@ before_script:
# Install Rust ("stable" toolchain for better caching, it is just used to build rustup-toolchain-install-master)
- curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain stable
- export PATH=$HOME/.cargo/bin:$PATH
- rustup update
# Install "master" toolchain
- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c cargo -c rust-src
- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src
- rustup default master
- rustc --version