Fix travis

Author: Manishearth

.travis.yml

@@ -1,6 +1,6 @@
 language: rust
 
-rust: nightly
+rust: beta
 
 os:
   - linux
@@ -17,6 +17,7 @@ branches:
 env:
  global:
    - RUST_BACKTRACE=1
+   - RUSTC_BOOTSTRAP=1
 
 install:
   - |
@@ -90,7 +91,7 @@ matrix:
 script:
   - |
       rm rust-toolchain
-      ./setup-toolchain.sh
+      rustup override set beta
       export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
   - |
     if [ -z ${INTEGRATION} ]; then

ci/base-tests.sh

@@ -75,4 +75,4 @@ if [ "${tests_need_reformatting}" == "true" ] ; then
 fi
 
 # switch back to master
-rustup override set master
+# rustup override set master