diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-08-03 22:29:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-03 22:29:29 +0200 |
| commit | 9c18fdc71f867d7a9269051867bd73983f80d4be (patch) | |
| tree | 96114b3114f4f2adfa1350a7e7ca758e2b77cd38 /compiler/rustc_parse/src/parser/item.rs | |
| parent | 0de7f756f034d9be9ea9d00ad994b3d5002f9255 (diff) | |
| parent | 0ad06f14820e90cb22b02b3678b6af20e0fe358a (diff) | |
| download | rust-9c18fdc71f867d7a9269051867bd73983f80d4be.tar.gz rust-9c18fdc71f867d7a9269051867bd73983f80d4be.zip | |
Rollup merge of #99786 - obeis:issue-99625, r=compiler-errors
Recover from C++ style `enum struct` Closes #99625
Diffstat (limited to 'compiler/rustc_parse/src/parser/item.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/item.rs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs index 2c1e5807aa7..5670729253d 100644 --- a/compiler/rustc_parse/src/parser/item.rs +++ b/compiler/rustc_parse/src/parser/item.rs @@ -1216,6 +1216,25 @@ impl<'a> Parser<'a> { /// Parses an enum declaration. fn parse_item_enum(&mut self) -> PResult<'a, ItemInfo> { + if self.token.is_keyword(kw::Struct) { + let mut err = self.struct_span_err( + self.prev_token.span.to(self.token.span), + "`enum` and `struct` are mutually exclusive", + ); + err.span_suggestion( + self.prev_token.span.to(self.token.span), + "replace `enum struct` with", + "enum", + Applicability::MachineApplicable, + ); + if self.look_ahead(1, |t| t.is_ident()) { + self.bump(); + err.emit(); + } else { + return Err(err); + } + } + let id = self.parse_ident()?; let mut generics = self.parse_generics()?; generics.where_clause = self.parse_where_clause()?; |
