Skip to content

Commit

Permalink
adjust for slice pattern changes
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed Jul 29, 2019
1 parent 784ad69 commit 87f20fe
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions tests/run-pass/issue-15080.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ fn main() {
let mut result = vec!();
loop {
x = match *x {
[1, n, 3, ref rest..] => {
[1, n, 3, ref rest @ ..] => {
result.push(n);
rest
}
[n, ref rest..] => {
[n, ref rest @ ..] => {
result.push(n);
rest
}
Expand Down
4 changes: 2 additions & 2 deletions tests/run-pass/issue-17877.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ fn main() {
}, 42_usize);

assert_eq!(match [0u8; 1024] {
[1, _..] => 0_usize,
[0, _..] => 1_usize,
[1, ..] => 0_usize,
[0, ..] => 1_usize,
_ => 2_usize
}, 1_usize);
}
2 changes: 1 addition & 1 deletion tests/run-pass/subslice_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ fn bar(a: &'static str, b: &'static str) -> [&'static str; 4] {

fn main() {
let out = bar("baz", "foo");
let [a, xs.., d] = out;
let [a, xs @ .., d] = out;
assert_eq!(a, "baz");
assert_eq!(xs, ["foo", "foo"]);
assert_eq!(d, "baz");
Expand Down
4 changes: 2 additions & 2 deletions tests/run-pass/vec-matching-fold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn foldl<T, U, F>(values: &[T],
U: Clone+Debug, T:Debug,
F: FnMut(U, &T) -> U,
{ match values {
&[ref head, ref tail..] =>
&[ref head, ref tail @ ..] =>
foldl(tail, function(initial, head), function),
&[] => {
let res = initial.clone(); res
Expand All @@ -25,7 +25,7 @@ fn foldr<T, U, F>(values: &[T],
F: FnMut(&T, U) -> U,
{
match values {
&[ref head.., ref tail] =>
&[ref head @ .., ref tail] =>
foldr(head, function(tail, initial), function),
&[] => {
let res = initial.clone(); res
Expand Down

0 comments on commit 87f20fe

Please sign in to comment.