Test fixes from the rollup

diff --git a/src/test/compile-fail/feature-gate-advanced-slice-features.rs b/src/test/compile-fail/feature-gate-advanced-slice-features.rs
index c6753baf0571e1f2d67fbb5246275aff6c9dd1e2..97d593d310e139714e5c10e3d00a5f166e244c16 100644 (file)
--- a/src/test/compile-fail/feature-gate-advanced-slice-features.rs
+++ b/src/test/compile-fail/feature-gate-advanced-slice-features.rs
@@ -11,9 +11,9 @@
 fn main() {
     let x = [ 1i, 2, 3, 4, 5 ];
     match x {
-        [ ..xs, 4, 5 ] => {}    //~ ERROR multiple-element slice matches
-        [ 1, ..xs, 5 ] => {}    //~ ERROR multiple-element slice matches
-        [ 1, 2, ..xs ] => {}    // OK without feature gate
+        [ xs.., 4, 5 ] => {}    //~ ERROR multiple-element slice matches
+        [ 1, xs.., 5 ] => {}    //~ ERROR multiple-element slice matches
+        [ 1, 2, xs.. ] => {}    // OK without feature gate
     }
 }
 

diff --git a/src/test/run-pass-fulldeps/issue-16992.rs b/src/test/run-pass-fulldeps/issue-16992.rs
index 71fab67b81910ec3a9759b5899bfefc8cd2cb574..563b8394963256d224474d4c54ec8f50a117b1d2 100644 (file)
--- a/src/test/run-pass-fulldeps/issue-16992.rs
+++ b/src/test/run-pass-fulldeps/issue-16992.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-pretty
+// ignore-android
 
 #![feature(quote)]