Skip to content

bump Rust #862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2019
Merged

bump Rust #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
784ad69
bump Rust
RalfJung Jul 29, 2019
87f20fe
adjust for slice pattern changes
RalfJung Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0e9b465d729d07101b29b4d096d83edf9be82df0
8b94e9e9188b65df38a5f1ae723617dc2dfb3155
4 changes: 2 additions & 2 deletions tests/run-pass/issue-15080.rs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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