about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-09-09 08:08:30 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-09-09 13:13:04 -0700
commite5abe15ff55212c60fc4acc9bfc2bc79038507b8 (patch)
tree79cd7984fb470f273f5907c579a2db5f71296c7e
parent25e08fb4fef32b1687e077cfc87e817f75c29615 (diff)
downloadrust-e5abe15ff55212c60fc4acc9bfc2bc79038507b8.tar.gz
rust-e5abe15ff55212c60fc4acc9bfc2bc79038507b8.zip
Test fixes from the rollup
-rw-r--r--src/test/compile-fail/feature-gate-advanced-slice-features.rs6
-rw-r--r--src/test/run-pass-fulldeps/issue-16992.rs1
2 files changed, 4 insertions, 3 deletions
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 c6753baf057..97d593d310e 100644
--- 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 71fab67b819..563b8394963 100644
--- 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)]