librustc_mir: use ? in impl_snapshot_for! macro

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index a8e1bfbbfa93ae53603588d193522c08bef822cd..7985b6c0e191f770815fc37d4ee7a7f4ce154020 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,7 +168,7 @@ matrix:
       if: branch = auto
     - env: IMAGE=i686-gnu-nopt
       if: branch = auto
-    - env: IMAGE=wasm32-unknown
+    - env: IMAGE=test-various
       if: branch = auto
     - env: IMAGE=x86_64-gnu
       if: branch = auto
@@ -186,8 +186,6 @@ matrix:
       if: branch = auto
     - env: IMAGE=mingw-check
       if: type = pull_request OR branch = auto
-    - env: IMAGE=nvptx-cuda
-      if: branch = auto
 
     - stage: publish toolstate
       if: branch = master AND type = push