1
Fork 0

suggest struct when we get colon in fileds in enum

This commit is contained in:
yukang 2023-05-03 10:40:08 +08:00
parent 04c53444df
commit 6b76588222
4 changed files with 37 additions and 5 deletions

View file

@ -1262,6 +1262,7 @@ impl<'a> Parser<'a> {
} }
} }
let prev_span = self.prev_token.span;
let id = self.parse_ident()?; let id = self.parse_ident()?;
let mut generics = self.parse_generics()?; let mut generics = self.parse_generics()?;
generics.where_clause = self.parse_where_clause()?; generics.where_clause = self.parse_where_clause()?;
@ -1275,6 +1276,14 @@ impl<'a> Parser<'a> {
self.parse_delim_comma_seq(Delimiter::Brace, |p| p.parse_enum_variant()).map_err( self.parse_delim_comma_seq(Delimiter::Brace, |p| p.parse_enum_variant()).map_err(
|mut e| { |mut e| {
e.span_label(id.span, "while parsing this enum"); e.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,
);
}
self.recover_stmt(); self.recover_stmt();
e e
}, },

View file

@ -0,0 +1,13 @@
// run-rustfix
struct VecOrMap {
//~^ HELP: perhaps you meant to use `struct` here
vec: Vec<usize>,
//~^ ERROR expected one of `(`, `,`, `=`, `{`, or `}`, found `:`
//~| HELP: enum variants can be `Variant`, `Variant = <integer>`, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }`
}
fn main() {
let o = VecOrMap { vec: vec![1, 2, 3] };
println!("{:?}", o.vec);
}

View file

@ -1,8 +1,13 @@
// run-rustfix
enum VecOrMap { enum VecOrMap {
//~^ HELP: perhaps you meant to use `struct` here
vec: Vec<usize>, vec: Vec<usize>,
//~^ ERROR expected one of `(`, `,`, `=`, `{`, or `}`, found `:` //~^ ERROR expected one of `(`, `,`, `=`, `{`, or `}`, found `:`
//~| HELP: enum variants can be `Variant`, `Variant = <integer>`, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }` //~| HELP: enum variants can be `Variant`, `Variant = <integer>`, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }`
map: HashMap<String,usize>
} }
fn main() {} fn main() {
let o = VecOrMap { vec: vec![1, 2, 3] };
println!("{:?}", o.vec);
}

View file

@ -1,12 +1,17 @@
error: expected one of `(`, `,`, `=`, `{`, or `}`, found `:` error: expected one of `(`, `,`, `=`, `{`, or `}`, found `:`
--> $DIR/issue-103869.rs:2:8 --> $DIR/issue-103869.rs:5:8
| |
LL | enum VecOrMap { LL | enum VecOrMap {
| -------- while parsing this enum | -------- while parsing this enum
LL |
LL | vec: Vec<usize>, LL | vec: Vec<usize>,
| ^ expected one of `(`, `,`, `=`, `{`, or `}` | ^ expected one of `(`, `,`, `=`, `{`, or `}`
| |
= help: enum variants can be `Variant`, `Variant = <integer>`, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }` = help: enum variants can be `Variant`, `Variant = <integer>`, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }`
help: perhaps you meant to use `struct` here
|
LL | struct VecOrMap {
| ~~~~~~
error: aborting due to previous error error: aborting due to previous error