Added `move` keyword and renamed `fail` to `panic`

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index e8d74c0eb1d7a3ed985d212bf8b1cedcefe890cf..261990052988f65a8fae1d0606015c48fcbb13d9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,6 @@
 # downloads a rust/cargo snapshot, which we don't really want for building rust.
 language: c
 
-# Make sure we've got an up-to-date g++ compiler to get past the LLVM configure
-# script.
-install:
-  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update -qq
-  - sudo apt-get install g++-4.7
-
 # The test suite is in general way too stressful for travis, especially in
 # terms of time limit and reliability. In the past we've tried to scale things
 # back to only build the stage1 compiler and run a subset of tests, but this
@@ -18,17 +11,13 @@ install:
 # As a result, we're just using travis to run `make tidy` now. It'll help
 # everyone find out about their trailing spaces early on!
 before_script:
-  - ./configure --llvm-root=`pwd`/local-llvm
+  - ./configure --llvm-root=path/to/nowhere
 script:
   - make tidy
 
 notifications:
   email: false
 
-env:
-  global:
-    - LLVM_VERSION=3.4
-
 branches:
   only:
     - master