Skip to content

Commit

Permalink
feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
rukai committed Nov 15, 2021
1 parent f980f81 commit 62acf7f
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 18 deletions.
17 changes: 9 additions & 8 deletions compiler/rustc_typeck/src/check/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
for field in fields {
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) {
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!(
tcx.sess,
field_span,
Expand All @@ -387,7 +385,10 @@ fn check_union_fields(tcx: TyCtxt<'_>, span: Span, item_def_id: LocalDefId) -> b
)
.multipart_suggestion_verbose(
"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,
)
.emit();
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/feature-gates/feature-gate-untagged_unions.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LL | a: String,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
|
LL | a: std::mem::ManuallyDrop<String>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| +++++++++++++++++++++++ +

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

error: aborting due to 3 previous errors

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/union/issue-41073.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LL | a: A,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
|
LL | a: std::mem::ManuallyDrop<A>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~
| +++++++++++++++++++++++ +

error: aborting due to previous error

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/union/union-custom-drop.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LL | bar: Bar,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
|
LL | bar: std::mem::ManuallyDrop<Bar>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~
| +++++++++++++++++++++++ +

error: aborting due to previous error

Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/union/union-with-drop-fields.mirunsafeck.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LL | a: String,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
|
LL | a: std::mem::ManuallyDrop<String>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| +++++++++++++++++++++++ +

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

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

error: aborting due to 3 previous errors

Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/union/union-with-drop-fields.thirunsafeck.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LL | a: String,
help: wrap the type with `std::mem::ManuallyDrop` and ensure it is manually dropped
|
LL | a: std::mem::ManuallyDrop<String>,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| +++++++++++++++++++++++ +

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

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

error: aborting due to 3 previous errors

Expand Down

0 comments on commit 62acf7f

Please sign in to comment.