forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#67464 - Centril:rollup-j3mkl1m, r=Centril
Rollup of 6 pull requests Successful merges: - rust-lang#67130 (Const prop should finish propagation into user defined variables) - rust-lang#67163 (Split up ptr/mod.rs in libcore...) - rust-lang#67314 (Don't suppress move errors for union fields) - rust-lang#67392 (Fix unresolved type span inside async object) - rust-lang#67404 (Separate region inference logic from error handling better) - rust-lang#67428 (`is_binding_pat`: use explicit match & include or-pats in grammar) Failed merges: r? @ghost
Showing
18 changed files
with
2,090 additions
and
1,828 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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
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
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
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
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
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
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,149 @@ | ||
| // compile-flags: -C overflow-checks=on | ||
|
|
||
| struct Point { | ||
| x: u32, | ||
| y: u32, | ||
| } | ||
|
|
||
| fn main() { | ||
| let x = 2 + 2; | ||
| let y = [0, 1, 2, 3, 4, 5][3]; | ||
| let z = (Point { x: 12, y: 42}).y; | ||
| } | ||
|
|
||
| // END RUST SOURCE | ||
| // START rustc.main.ConstProp.before.mir | ||
| // let mut _0: (); | ||
| // let _1: i32; | ||
| // let mut _2: (i32, bool); | ||
| // let mut _4: [i32; 6]; | ||
| // let _5: usize; | ||
| // let mut _6: usize; | ||
| // let mut _7: bool; | ||
| // let mut _9: Point; | ||
| // scope 1 { | ||
| // debug x => _1; | ||
| // let _3: i32; | ||
| // scope 2 { | ||
| // debug y => _3; | ||
| // let _8: u32; | ||
| // scope 3 { | ||
| // debug z => _8; | ||
| // } | ||
| // } | ||
| // } | ||
| // bb0: { | ||
| // StorageLive(_1); | ||
| // _2 = CheckedAdd(const 2i32, const 2i32); | ||
| // assert(!move (_2.1: bool), "attempt to add with overflow") -> bb1; | ||
| // } | ||
| // bb1: { | ||
| // _1 = move (_2.0: i32); | ||
| // StorageLive(_3); | ||
| // StorageLive(_4); | ||
| // _4 = [const 0i32, const 1i32, const 2i32, const 3i32, const 4i32, const 5i32]; | ||
| // StorageLive(_5); | ||
| // _5 = const 3usize; | ||
| // _6 = const 6usize; | ||
| // _7 = Lt(_5, _6); | ||
| // assert(move _7, "index out of bounds: the len is move _6 but the index is _5") -> bb2; | ||
| // } | ||
| // bb2: { | ||
| // _3 = _4[_5]; | ||
| // StorageDead(_5); | ||
| // StorageDead(_4); | ||
| // StorageLive(_8); | ||
| // StorageLive(_9); | ||
| // _9 = Point { x: const 12u32, y: const 42u32 }; | ||
| // _8 = (_9.1: u32); | ||
| // StorageDead(_9); | ||
| // _0 = (); | ||
| // StorageDead(_8); | ||
| // StorageDead(_3); | ||
| // StorageDead(_1); | ||
| // return; | ||
| // } | ||
| // END rustc.main.ConstProp.before.mir | ||
| // START rustc.main.ConstProp.after.mir | ||
| // let mut _0: (); | ||
| // let _1: i32; | ||
| // let mut _2: (i32, bool); | ||
| // let mut _4: [i32; 6]; | ||
| // let _5: usize; | ||
| // let mut _6: usize; | ||
| // let mut _7: bool; | ||
| // let mut _9: Point; | ||
| // scope 1 { | ||
| // debug x => _1; | ||
| // let _3: i32; | ||
| // scope 2 { | ||
| // debug y => _3; | ||
| // let _8: u32; | ||
| // scope 3 { | ||
| // debug z => _8; | ||
| // } | ||
| // } | ||
| // } | ||
| // bb0: { | ||
| // StorageLive(_1); | ||
| // _2 = (const 4i32, const false); | ||
| // assert(!const false, "attempt to add with overflow") -> bb1; | ||
| // } | ||
| // bb1: { | ||
| // _1 = const 4i32; | ||
| // StorageLive(_3); | ||
| // StorageLive(_4); | ||
| // _4 = [const 0i32, const 1i32, const 2i32, const 3i32, const 4i32, const 5i32]; | ||
| // StorageLive(_5); | ||
| // _5 = const 3usize; | ||
| // _6 = const 6usize; | ||
| // _7 = const true; | ||
| // assert(const true, "index out of bounds: the len is move _6 but the index is _5") -> bb2; | ||
| // } | ||
| // bb2: { | ||
| // _3 = const 3i32; | ||
| // StorageDead(_5); | ||
| // StorageDead(_4); | ||
| // StorageLive(_8); | ||
| // StorageLive(_9); | ||
| // _9 = Point { x: const 12u32, y: const 42u32 }; | ||
| // _8 = const 42u32; | ||
| // StorageDead(_9); | ||
| // _0 = (); | ||
| // StorageDead(_8); | ||
| // StorageDead(_3); | ||
| // StorageDead(_1); | ||
| // return; | ||
| // } | ||
| // END rustc.main.ConstProp.after.mir | ||
| // START rustc.main.SimplifyLocals.after.mir | ||
| // let mut _0: (); | ||
| // let _1: i32; | ||
| // let mut _3: [i32; 6]; | ||
| // scope 1 { | ||
| // debug x => _1; | ||
| // let _2: i32; | ||
| // scope 2 { | ||
| // debug y => _2; | ||
| // let _4: u32; | ||
| // scope 3 { | ||
| // debug z => _4; | ||
| // } | ||
| // } | ||
| // } | ||
| // bb0: { | ||
| // StorageLive(_1); | ||
| // _1 = const 4i32; | ||
| // StorageLive(_2); | ||
| // StorageLive(_3); | ||
| // _3 = [const 0i32, const 1i32, const 2i32, const 3i32, const 4i32, const 5i32]; | ||
| // _2 = const 3i32; | ||
| // StorageDead(_3); | ||
| // StorageLive(_4); | ||
| // _4 = const 42u32; | ||
| // StorageDead(_4); | ||
| // StorageDead(_2); | ||
| // StorageDead(_1); | ||
| // return; | ||
| // } | ||
| // END rustc.main.SimplifyLocals.after.mir |
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
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
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,30 @@ | ||
| // Moving from a reference/raw pointer should be an error, even when they're | ||
| // the field of a union. | ||
|
|
||
| #![feature(untagged_unions)] | ||
|
|
||
| union Pointers { | ||
| a: &'static String, | ||
| b: &'static mut String, | ||
| c: *const String, | ||
| d: *mut String, | ||
| } | ||
|
|
||
| unsafe fn move_ref(u: Pointers) -> String { | ||
| *u.a | ||
| //~^ ERROR cannot move out of `*u.a` | ||
| } | ||
| unsafe fn move_ref_mut(u: Pointers) -> String { | ||
| *u.b | ||
| //~^ ERROR cannot move out of `*u.b` | ||
| } | ||
| unsafe fn move_ptr(u: Pointers) -> String { | ||
| *u.c | ||
| //~^ ERROR cannot move out of `*u.c` | ||
| } | ||
| unsafe fn move_ptr_mut(u: Pointers) -> String { | ||
| *u.d | ||
| //~^ ERROR cannot move out of `*u.d` | ||
| } | ||
|
|
||
| fn main() {} |
27 changes: 27 additions & 0 deletions
27
src/test/ui/borrowck/move-from-union-field-issue-66500.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,27 @@ | ||
| error[E0507]: cannot move out of `*u.a` which is behind a shared reference | ||
| --> $DIR/move-from-union-field-issue-66500.rs:14:5 | ||
| | | ||
| LL | *u.a | ||
| | ^^^^ move occurs because `*u.a` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
|
||
| error[E0507]: cannot move out of `*u.b` which is behind a mutable reference | ||
| --> $DIR/move-from-union-field-issue-66500.rs:18:5 | ||
| | | ||
| LL | *u.b | ||
| | ^^^^ move occurs because `*u.b` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
|
||
| error[E0507]: cannot move out of `*u.c` which is behind a raw pointer | ||
| --> $DIR/move-from-union-field-issue-66500.rs:22:5 | ||
| | | ||
| LL | *u.c | ||
| | ^^^^ move occurs because `*u.c` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
|
||
| error[E0507]: cannot move out of `*u.d` which is behind a raw pointer | ||
| --> $DIR/move-from-union-field-issue-66500.rs:26:5 | ||
| | | ||
| LL | *u.d | ||
| | ^^^^ move occurs because `*u.d` has type `std::string::String`, which does not implement the `Copy` trait | ||
|
|
||
| error: aborting due to 4 previous errors | ||
|
|
||
| For more information about this error, try `rustc --explain E0507`. |
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