udpdate error message for unsized union field #43901
Conversation
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
| @@ -1112,7 +1112,8 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> { | |||
| err.note("structs must have a statically known size to be initialized"); | |||
| } | |||
| ObligationCauseCode::FieldSized => { | |||
| err.note("only the last field of a struct may have a dynamically sized type"); | |||
| err.note("only the last field of a struct or an union may have a dynamically \ | |||
There was a problem hiding this comment.
"an union" -> "a union"
There was a problem hiding this comment.
The "last field" part is not relevant for unions, unions may not have unsized fields regardless of position.
There was a problem hiding this comment.
This message also applies to enums so I think it would be best to have different messages for structs, enums and unions.
|
Updated. I'm not too sure about the note messages though... |
aidanhs
added
the
S-waiting-on-review
| match *item { | ||
| hir::ItemStruct(_, _) => { | ||
| err.note("only the last field of a struct may have a dynamically type \ | ||
| sized type"); |
There was a problem hiding this comment.
"dynamically type sized type" -> "dynamically sized type" here and below
| err.note("no field of a union may have a dynamically type sized type"); | ||
| } | ||
| hir::ItemEnum(_, _) => { | ||
| err.note("no variant of an enum may have a dynamically type sized type"); |
There was a problem hiding this comment.
"no variant of an enum" -> "no field of an enum variant"
src/librustc/traits/mod.rs
Outdated
| @@ -133,7 +133,7 @@ pub enum ObligationCauseCode<'tcx> { | |||
| RepeatVec, | |||
|
|
|||
| /// Types of fields (other than the last) in a struct must be sized. | |||
| FieldSized, | |||
| FieldSized(hir::Item_), | |||
There was a problem hiding this comment.
You can use ty::AdtKind here to avoid cloning HIR items.
GuillaumeGomez
force-pushed
the
unsized-union-field
branch
from
210e2b5 to
6abd035
Compare
|
Updated. |
| @@ -195,7 +195,7 @@ impl<'a, 'tcx> Lift<'tcx> for traits::ObligationCauseCode<'a> { | |||
| super::ReturnType(id) => Some(super::ReturnType(id)), | |||
| super::SizedReturnType => Some(super::SizedReturnType), | |||
| super::RepeatVec => Some(super::RepeatVec), | |||
| super::FieldSized => Some(super::FieldSized), | |||
| super::FieldSized(ref item) => Some(super::FieldSized(*item)), | |||
There was a problem hiding this comment.
Nit: ref and * are unnecessary.
|
r=me with the nit fixed |
GuillaumeGomez
force-pushed
the
unsized-union-field
branch
from
6abd035 to
c3c99b9
Compare
|
Fixed and squashed the extra commit. @bors: r=petrochenkov |
|
📌 Commit c3c99b9 has been approved by |
…nkov udpdate error message for unsized union field Fixes #36312.
|
☀️ Test successful - status-appveyor, status-travis |
Fixes #36312.