bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

needs -> might need

Browse source
This commit is contained in:
Ralf Jung 2020-10-28 08:57:57 +01:00
parent 63bdb3ac09
commit af309cc2d9
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/mir/query.rs
View file

@ -95,7 +95,7 @@ impl UnsafetyViolationDetails {
and cause data races: all of these are undefined behavior", and cause data races: all of these are undefined behavior",
), ),
AssignToDroppingUnionField => ( AssignToDroppingUnionField => (
"assignment to union field that needs dropping", "assignment to union field that might need dropping",
"the previous content of the field will be dropped, which causes undefined \ "the previous content of the field will be dropped, which causes undefined \
behavior if the field was not properly initialized", behavior if the field was not properly initialized",
), ),

4
src/test/ui/union/union-unsafe.rs
View file

@ -32,8 +32,8 @@ fn deref_union_field(mut u: URef) {
} }
fn assign_noncopy_union_field(mut u: URefCell) { fn assign_noncopy_union_field(mut u: URefCell) {
u.a = (RefCell::new(0), 1); //~ ERROR assignment to union field that needs dropping u.a = (RefCell::new(0), 1); //~ ERROR assignment to union field that might need dropping
u.a.0 = RefCell::new(0); //~ ERROR assignment to union field that needs dropping u.a.0 = RefCell::new(0); //~ ERROR assignment to union field that might need dropping
u.a.1 = 1; // OK u.a.1 = 1; // OK
} }

8
src/test/ui/union/union-unsafe.stderr
View file

@ -6,19 +6,19 @@ LL | *(u.p) = 13;
| |
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior = note: the field may not be properly initialized: using uninitialized data will cause undefined behavior
error[E0133]: assignment to union field that needs dropping is unsafe and requires unsafe function or block error[E0133]: assignment to union field that might need dropping is unsafe and requires unsafe function or block
--> $DIR/union-unsafe.rs:35:5 --> $DIR/union-unsafe.rs:35:5
| |
LL | u.a = (RefCell::new(0), 1); LL | u.a = (RefCell::new(0), 1);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to union field that needs dropping | ^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to union field that might need dropping
| |
= note: the previous content of the field will be dropped, which causes undefined behavior if the field was not properly initialized = note: the previous content of the field will be dropped, which causes undefined behavior if the field was not properly initialized
error[E0133]: assignment to union field that needs dropping is unsafe and requires unsafe function or block error[E0133]: assignment to union field that might need dropping is unsafe and requires unsafe function or block
--> $DIR/union-unsafe.rs:36:5 --> $DIR/union-unsafe.rs:36:5
| |
LL | u.a.0 = RefCell::new(0); LL | u.a.0 = RefCell::new(0);
| ^^^^^^^^^^^^^^^^^^^^^^^ assignment to union field that needs dropping | ^^^^^^^^^^^^^^^^^^^^^^^ assignment to union field that might need dropping
| |
= note: the previous content of the field will be dropped, which causes undefined behavior if the field was not properly initialized = note: the previous content of the field will be dropped, which causes undefined behavior if the field was not properly initialized