-
Notifications
You must be signed in to change notification settings - Fork 12.5k
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.
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
Remove uniform array move MIR passes #66650
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
bf278eb
Make const index and subslice array projections more useful
matthewjasper 96dc03b
Remove `uniform_array_move_out` passes
matthewjasper cab7af9
Check for `ConstantIndex` move paths correctly in borrowck
matthewjasper d96485d
Add more tests for borrowck and dropck slice pattern handling
matthewjasper File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
69 changes: 69 additions & 0 deletions
69
src/test/ui/borrowck/borrowck-move-out-from-array-no-overlap.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
// check-pass | ||
|
||
#![feature(slice_patterns)] | ||
|
||
fn array() -> [(String, String); 3] { | ||
Default::default() | ||
} | ||
|
||
// Const Index + Const Index | ||
|
||
fn move_out_from_begin_and_one_from_end() { | ||
let a = array(); | ||
let [_, _, _x] = a; | ||
let [.., _y, _] = a; | ||
} | ||
|
||
fn move_out_from_begin_field_and_end_field() { | ||
let a = array(); | ||
let [_, _, (_x, _)] = a; | ||
let [.., (_, _y)] = a; | ||
} | ||
|
||
// Const Index + Slice | ||
|
||
fn move_out_by_const_index_and_subslice() { | ||
let a = array(); | ||
let [_x, _, _] = a; | ||
let [_, _y @ ..] = a; | ||
} | ||
|
||
fn move_out_by_const_index_end_and_subslice() { | ||
let a = array(); | ||
let [.., _x] = a; | ||
let [_y @ .., _] = a; | ||
} | ||
|
||
fn move_out_by_const_index_field_and_subslice() { | ||
let a = array(); | ||
let [(_x, _), _, _] = a; | ||
let [_, _y @ ..] = a; | ||
} | ||
|
||
fn move_out_by_const_index_end_field_and_subslice() { | ||
let a = array(); | ||
let [.., (_x, _)] = a; | ||
let [_y @ .., _] = a; | ||
} | ||
|
||
fn move_out_by_const_subslice_and_index_field() { | ||
let a = array(); | ||
let [_, _y @ ..] = a; | ||
let [(_x, _), _, _] = a; | ||
} | ||
|
||
fn move_out_by_const_subslice_and_end_index_field() { | ||
let a = array(); | ||
let [_y @ .., _] = a; | ||
let [.., (_x, _)] = a; | ||
} | ||
|
||
// Slice + Slice | ||
|
||
fn move_out_by_subslice_and_subslice() { | ||
let a = array(); | ||
let [x @ .., _, _] = a; | ||
let [_, _y @ ..] = a; | ||
} | ||
|
||
fn main() {} |
69 changes: 69 additions & 0 deletions
69
src/test/ui/borrowck/borrowck-move-out-from-array-use-no-overlap.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
// check-pass | ||
|
||
#![feature(slice_patterns)] | ||
|
||
fn array() -> [(String, String); 3] { | ||
Default::default() | ||
} | ||
|
||
// Const Index + Const Index | ||
|
||
fn move_out_from_begin_and_one_from_end() { | ||
let a = array(); | ||
let [_, _, _x] = a; | ||
let [.., ref _y, _] = a; | ||
} | ||
|
||
fn move_out_from_begin_field_and_end_field() { | ||
let a = array(); | ||
let [_, _, (_x, _)] = a; | ||
let [.., (_, ref _y)] = a; | ||
} | ||
|
||
// Const Index + Slice | ||
|
||
fn move_out_by_const_index_and_subslice() { | ||
let a = array(); | ||
let [_x, _, _] = a; | ||
let [_, ref _y @ ..] = a; | ||
} | ||
|
||
fn move_out_by_const_index_end_and_subslice() { | ||
let a = array(); | ||
let [.., _x] = a; | ||
let [ref _y @ .., _] = a; | ||
} | ||
|
||
fn move_out_by_const_index_field_and_subslice() { | ||
let a = array(); | ||
let [(_x, _), _, _] = a; | ||
let [_, ref _y @ ..] = a; | ||
} | ||
|
||
fn move_out_by_const_index_end_field_and_subslice() { | ||
let a = array(); | ||
let [.., (_x, _)] = a; | ||
let [ref _y @ .., _] = a; | ||
} | ||
|
||
fn move_out_by_const_subslice_and_index_field() { | ||
let a = array(); | ||
let [_, _y @ ..] = a; | ||
let [(ref _x, _), _, _] = a; | ||
} | ||
|
||
fn move_out_by_const_subslice_and_end_index_field() { | ||
let a = array(); | ||
let [_y @ .., _] = a; | ||
let [.., (ref _x, _)] = a; | ||
} | ||
|
||
// Slice + Slice | ||
|
||
fn move_out_by_subslice_and_subslice() { | ||
let a = array(); | ||
let [x @ .., _, _] = a; | ||
let [_, ref _y @ ..] = a; | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
#![feature(slice_patterns)] | ||
|
||
fn array() -> [(String, String); 3] { | ||
Default::default() | ||
} | ||
|
||
// Const Index + Const Index | ||
|
||
fn move_out_from_begin_and_end() { | ||
let a = array(); | ||
let [_, _, _x] = a; | ||
let [.., ref _y] = a; //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_from_begin_field_and_end() { | ||
let a = array(); | ||
let [_, _, (_x, _)] = a; | ||
let [.., ref _y] = a; //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_from_begin_field_and_end_field() { | ||
let a = array(); | ||
let [_, _, (_x, _)] = a; | ||
let [.., (ref _y, _)] = a; //~ ERROR [E0382] | ||
} | ||
|
||
// Const Index + Slice | ||
|
||
fn move_out_by_const_index_and_subslice() { | ||
let a = array(); | ||
let [_x, _, _] = a; | ||
let [ref _y @ .., _, _] = a; //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_by_const_index_end_and_subslice() { | ||
let a = array(); | ||
let [.., _x] = a; | ||
let [_, _, ref _y @ ..] = a; //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_by_const_index_field_and_subslice() { | ||
let a = array(); | ||
let [(_x, _), _, _] = a; | ||
let [ref _y @ .., _, _] = a; //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_by_const_index_end_field_and_subslice() { | ||
let a = array(); | ||
let [.., (_x, _)] = a; | ||
let [_, _, ref _y @ ..] = a; //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_by_subslice_and_const_index_field() { | ||
let a = array(); | ||
let [_y @ .., _, _] = a; | ||
let [(ref _x, _), _, _] = a; //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_by_subslice_and_const_index_end_field() { | ||
let a = array(); | ||
let [_, _, _y @ ..] = a; | ||
let [.., (ref _x, _)] = a; //~ ERROR [E0382] | ||
} | ||
|
||
// Slice + Slice | ||
|
||
fn move_out_by_subslice_and_subslice() { | ||
let a = array(); | ||
let [x @ .., _] = a; | ||
let [_, ref _y @ ..] = a; //~ ERROR [E0382] | ||
} | ||
|
||
// Move + Assign | ||
|
||
fn move_out_and_assign_end() { | ||
let mut a = array(); | ||
let [_, _, _x] = a; | ||
a[2] = Default::default(); //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_and_assign_end_field() { | ||
let mut a = array(); | ||
let [_, _, (_x, _)] = a; | ||
a[2].1 = Default::default(); //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_slice_and_assign_end() { | ||
let mut a = array(); | ||
let [_, _, _x @ ..] = a; | ||
a[0] = Default::default(); //~ ERROR [E0382] | ||
} | ||
|
||
fn move_out_slice_and_assign_end_field() { | ||
let mut a = array(); | ||
let [_, _, _x @ ..] = a; | ||
a[0].1 = Default::default(); //~ ERROR [E0382] | ||
} | ||
|
||
fn main() {} |
143 changes: 143 additions & 0 deletions
143
src/test/ui/borrowck/borrowck-move-out-from-array-use.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,143 @@ | ||
error[E0382]: borrow of moved value: `a[..]` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:12:14 | ||
| | ||
LL | let [_, _, _x] = a; | ||
| -- value moved here | ||
LL | let [.., ref _y] = a; | ||
| ^^^^^^ value borrowed here after move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a[..]` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:18:14 | ||
| | ||
LL | let [_, _, (_x, _)] = a; | ||
| -- value moved here | ||
LL | let [.., ref _y] = a; | ||
| ^^^^^^ value borrowed here after partial move | ||
| | ||
= note: move occurs because `a[..].0` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a[..].0` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:24:15 | ||
| | ||
LL | let [_, _, (_x, _)] = a; | ||
| -- value moved here | ||
LL | let [.., (ref _y, _)] = a; | ||
| ^^^^^^ value borrowed here after move | ||
| | ||
= note: move occurs because `a[..].0` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:32:10 | ||
| | ||
LL | let [_x, _, _] = a; | ||
| -- value moved here | ||
LL | let [ref _y @ .., _, _] = a; | ||
| ^^^^^^^^^^^ value borrowed here after partial move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:38:16 | ||
| | ||
LL | let [.., _x] = a; | ||
| -- value moved here | ||
LL | let [_, _, ref _y @ ..] = a; | ||
| ^^^^^^^^^^^ value borrowed here after partial move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:44:10 | ||
| | ||
LL | let [(_x, _), _, _] = a; | ||
| -- value moved here | ||
LL | let [ref _y @ .., _, _] = a; | ||
| ^^^^^^^^^^^ value borrowed here after partial move | ||
| | ||
= note: move occurs because `a[..].0` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:50:16 | ||
| | ||
LL | let [.., (_x, _)] = a; | ||
| -- value moved here | ||
LL | let [_, _, ref _y @ ..] = a; | ||
| ^^^^^^^^^^^ value borrowed here after partial move | ||
| | ||
= note: move occurs because `a[..].0` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a[..]` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:56:11 | ||
| | ||
LL | let [_y @ .., _, _] = a; | ||
| ------- value moved here | ||
LL | let [(ref _x, _), _, _] = a; | ||
| ^^^^^^ value borrowed here after move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a[..]` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:62:15 | ||
| | ||
LL | let [_, _, _y @ ..] = a; | ||
| ------- value moved here | ||
LL | let [.., (ref _x, _)] = a; | ||
| ^^^^^^ value borrowed here after move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: borrow of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:70:13 | ||
| | ||
LL | let [x @ .., _] = a; | ||
| ------ value moved here | ||
LL | let [_, ref _y @ ..] = a; | ||
| ^^^^^^^^^^^ value borrowed here after partial move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: use of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:78:5 | ||
| | ||
LL | let [_, _, _x] = a; | ||
| -- value moved here | ||
LL | a[2] = Default::default(); | ||
| ^^^^ value used here after partial move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: use of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:84:5 | ||
| | ||
LL | let [_, _, (_x, _)] = a; | ||
| -- value moved here | ||
LL | a[2].1 = Default::default(); | ||
| ^^^^ value used here after partial move | ||
| | ||
= note: move occurs because `a[..].0` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: use of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:90:5 | ||
| | ||
LL | let [_, _, _x @ ..] = a; | ||
| ------- value moved here | ||
LL | a[0] = Default::default(); | ||
| ^^^^ value used here after partial move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error[E0382]: use of moved value: `a` | ||
--> $DIR/borrowck-move-out-from-array-use.rs:96:5 | ||
| | ||
LL | let [_, _, _x @ ..] = a; | ||
| ------- value moved here | ||
LL | a[0].1 = Default::default(); | ||
| ^^^^ value used here after partial move | ||
| | ||
= note: move occurs because `a[..]` has type `(std::string::String, std::string::String)`, which does not implement the `Copy` trait | ||
|
||
error: aborting due to 14 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0382`. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
beautiful set of tests