---

alexcrichton · alexcrichton · commit 598cf781af34 · 2014-09-09T13:13:04.000-07:00
yaml --- r: 130682 b: refs/heads/snap-stage3 c: e5abe15 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: ee72e46638f2b2ae92e99df2a7ea92690baa0d07
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 25e08fb4fef32b1687e077cfc87e817f75c29615
+refs/heads/snap-stage3: e5abe15ff55212c60fc4acc9bfc2bc79038507b8
 refs/heads/try: a2473a89da106f7dd3be86e9d52fe23f43d5bfa5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/test/compile-fail/feature-gate-advanced-slice-features.rs b/branches/snap-stage3/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/branches/snap-stage3/src/test/run-pass-fulldeps/issue-16992.rs b/branches/snap-stage3/src/test/run-pass-fulldeps/issue-16992.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-pretty
+// ignore-android
 
 #![feature(quote)]
 

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`	`fn main() {`
`12`	`12`	`let x = [ 1i, 2, 3, 4, 5 ];`
`13`	`13`	`match x {`
`14`		`- [ ..xs, 4, 5 ] => {} //~ ERROR multiple-element slice matches`
`15`		`- [ 1, ..xs, 5 ] => {} //~ ERROR multiple-element slice matches`
`16`		`- [ 1, 2, ..xs ] => {} // OK without feature gate`
	`14`	`+ [ xs.., 4, 5 ] => {} //~ ERROR multiple-element slice matches`
	`15`	`+ [ 1, xs.., 5 ] => {} //~ ERROR multiple-element slice matches`
	`16`	`+ [ 1, 2, xs.. ] => {} // OK without feature gate`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`