make it more accurate by parsing ty

rust-lang · May 8, 2023 · 0e8703d · 0e8703d
1 parent 6b76588
commit 0e8703d
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -1274,18 +1274,28 @@ impl<'a> Parser<'a> {
             (thin_vec![], false)
         } else {
             self.parse_delim_comma_seq(Delimiter::Brace, |p| p.parse_enum_variant()).map_err(
-                |mut e| {
-                    e.span_label(id.span, "while parsing this enum");
+                |mut err| {
+                    err.span_label(id.span, "while parsing this enum");
                     if self.token == token::Colon {
-                        e.span_suggestion_verbose(
-                            prev_span,
-                            "perhaps you meant to use `struct` here",
-                            "struct".to_string(),
-                            Applicability::MaybeIncorrect,
-                        );
+                        let snapshot = self.create_snapshot_for_diagnostic();
+                        self.bump();
+                        match self.parse_ty() {
+                            Ok(_) => {
+                                err.span_suggestion_verbose(
+                                    prev_span,
+                                    "perhaps you meant to use `struct` here",
+                                    "struct".to_string(),
+                                    Applicability::MaybeIncorrect,
+                                );
+                            }
+                            Err(e) => {
+                                e.cancel();
+                            }
+                        }
+                        self.restore_snapshot(snapshot);
                     }
                     self.recover_stmt();
-                    e
+                    err
                 },
             )?
         };