---

alexcrichton · alexcrichton · commit fd0578660284 · 2014-09-09T13:13:04.000-07:00
yaml --- r: 130921 b: refs/heads/auto c: e5abe15 h: refs/heads/master i: 130919: a126545 v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 25e08fb4fef32b1687e077cfc87e817f75c29615
+refs/heads/auto: e5abe15ff55212c60fc4acc9bfc2bc79038507b8
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/test/compile-fail/feature-gate-advanced-slice-features.rs b/branches/auto/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/auto/src/test/run-pass-fulldeps/issue-16992.rs b/branches/auto/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`