Skip to content

Commit

Permalink
Test fixes from the rollup
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed Sep 9, 2014
1 parent 25e08fb commit e5abe15
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/test/compile-fail/feature-gate-advanced-slice-features.rs
Expand Up @@ -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
}
}

1 change: 1 addition & 0 deletions src/test/run-pass-fulldeps/issue-16992.rs
Expand Up @@ -9,6 +9,7 @@
// except according to those terms.

// ignore-pretty
// ignore-android

#![feature(quote)]

Expand Down

5 comments on commit e5abe15

@bors
Copy link
Contributor

@bors bors commented on e5abe15 Sep 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at alexcrichton@e5abe15

@bors
Copy link
Contributor

@bors bors commented on e5abe15 Sep 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/rollup = e5abe15 into auto

@bors
Copy link
Contributor

@bors bors commented on e5abe15 Sep 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/rollup = e5abe15 merged ok, testing candidate = 6511064

@bors
Copy link
Contributor

@bors bors commented on e5abe15 Sep 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on e5abe15 Sep 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6511064

Please sign in to comment.