nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 06:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

feedback

Browse Source
This commit is contained in:
Lucas Kent 2021-11-15 14:47:36 +11:00
parent f980f813e1
commit 62acf7f96d
6 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_typeck/src/check/check.rs
View File

@ -371,14 +371,12 @@ fn check_union_fields(tcx: TyCtxt<'_>, span: Span, item_def_id: LocalDefId) -> b
let param_env = tcx.param_env(item_def_id); let param_env = tcx.param_env(item_def_id);
for field in fields { for field in fields {
let field_ty = field.ty(tcx, substs); let field_ty = field.ty(tcx, substs);
let (field_span, ty_span) =
// We are currently checking the type this field came from, so it must be local.
if let Node::Field(field) = tcx.hir().get_if_local(field.did).unwrap() {
(field.span, field.ty.span)
} else {
unreachable!("mir field has to correspond to hir field");
};
if field_ty.needs_drop(tcx, param_env) { if field_ty.needs_drop(tcx, param_env) {
let (field_span, ty_span) = match tcx.hir().get_if_local(field.did) {
// We are currently checking the type this field came from, so it must be local.
Some(Node::Field(field)) => (field.span, field.ty.span),
_ => unreachable!("mir field has to correspond to hir field"),
};
struct_span_err!( struct_span_err!(
tcx.sess, tcx.sess,
field_span, field_span,
@ -387,7 +385,10 @@ fn check_union_fields(tcx: TyCtxt<'_>, span: Span, item_def_id: LocalDefId) -> b
) )
.multipart_suggestion_verbose( .multipart_suggestion_verbose(
"wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped", "wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped",
vec![(ty_span, format!("std::mem::ManuallyDrop<{}>", field_ty))], vec![
(ty_span.shrink_to_lo(), format!("std::mem::ManuallyDrop<")),
(ty_span.shrink_to_hi(), ">".into()),
],
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
) )
.emit(); .emit();

4
src/test/ui/feature-gates/feature-gate-untagged_unions.stderr
View File

@ -16,7 +16,7 @@ LL | a: String,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<String>, LL | a: std::mem::ManuallyDrop<String>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error[E0740]: unions may not contain fields that need dropping error[E0740]: unions may not contain fields that need dropping
--> $DIR/feature-gate-untagged_unions.rs:24:5 --> $DIR/feature-gate-untagged_unions.rs:24:5
@ -27,7 +27,7 @@ LL | a: T,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<T>, LL | a: std::mem::ManuallyDrop<T>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error: aborting due to 3 previous errors error: aborting due to 3 previous errors

2
src/test/ui/union/issue-41073.stderr
View File

@ -7,7 +7,7 @@ LL | a: A,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<A>, LL | a: std::mem::ManuallyDrop<A>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/union/union-custom-drop.stderr
View File

@ -7,7 +7,7 @@ LL | bar: Bar,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | bar: std::mem::ManuallyDrop<Bar>, LL | bar: std::mem::ManuallyDrop<Bar>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error: aborting due to previous error error: aborting due to previous error

6
src/test/ui/union/union-with-drop-fields.mirunsafeck.stderr
View File

@ -7,7 +7,7 @@ LL | a: String,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<String>, LL | a: std::mem::ManuallyDrop<String>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error[E0740]: unions may not contain fields that need dropping error[E0740]: unions may not contain fields that need dropping
--> $DIR/union-with-drop-fields.rs:19:5 --> $DIR/union-with-drop-fields.rs:19:5
@ -18,7 +18,7 @@ LL | a: S,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<S>, LL | a: std::mem::ManuallyDrop<S>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error[E0740]: unions may not contain fields that need dropping error[E0740]: unions may not contain fields that need dropping
--> $DIR/union-with-drop-fields.rs:24:5 --> $DIR/union-with-drop-fields.rs:24:5
@ -29,7 +29,7 @@ LL | a: T,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<T>, LL | a: std::mem::ManuallyDrop<T>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error: aborting due to 3 previous errors error: aborting due to 3 previous errors

6
src/test/ui/union/union-with-drop-fields.thirunsafeck.stderr
View File

@ -7,7 +7,7 @@ LL | a: String,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<String>, LL | a: std::mem::ManuallyDrop<String>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error[E0740]: unions may not contain fields that need dropping error[E0740]: unions may not contain fields that need dropping
--> $DIR/union-with-drop-fields.rs:19:5 --> $DIR/union-with-drop-fields.rs:19:5
@ -18,7 +18,7 @@ LL | a: S,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<S>, LL | a: std::mem::ManuallyDrop<S>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error[E0740]: unions may not contain fields that need dropping error[E0740]: unions may not contain fields that need dropping
--> $DIR/union-with-drop-fields.rs:24:5 --> $DIR/union-with-drop-fields.rs:24:5
@ -29,7 +29,7 @@ LL | a: T,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
| |
LL | a: std::mem::ManuallyDrop<T>, LL | a: std::mem::ManuallyDrop<T>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | +++++++++++++++++++++++ +
error: aborting due to 3 previous errors error: aborting due to 3 previous errors