Keep the rustc master install in the travis file so we can use travis_retry

Author: oli-obk

.travis.yml

@@ -50,6 +50,10 @@ matrix:
     - env: INTEGRATION=hyperium/hyper
 
 script:
+  - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+  - RUSTC_HEAD=`git ls-remote https://github.com/rust-lang/rust.git HEAD | tr -d ",." | tr " \t" "\n" | grep -e "HEAD" -v`
+  - travis_retry rustup-toolchain-install-master $RUSTC_HEAD
+  - rustup default $RUSTC_HEAD
   - |
     if [ -z ${INTEGRATION} ]; then
       ./ci/base-tests.sh

ci/base-tests.sh

@@ -1,8 +1,4 @@
 set -ex
-cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
-RUSTC_HEAD=`git ls-remote https://github.com/rust-lang/rust.git HEAD | tr -d ",." | tr " \t" "\n" | grep -e "HEAD" -v`
-travis_retry rustup-toolchain-install-master $RUSTC_HEAD
-rustup default $RUSTC_HEAD
 PATH=$PATH:./node_modules/.bin
 remark -f *.md > /dev/null
 cargo build --features debugging