Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

diagnostics: error messages when struct literals fail to parse #99030

Merged
merged 3 commits into from
Jul 13, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
diagnostics: mention the : token when struct fields fail to parse
notriddle committed Jul 7, 2022
commit d496a4f8bb26709e58ce8821de07f7078d2f615d
5 changes: 5 additions & 0 deletions compiler/rustc_parse/src/parser/expr.rs
Original file line number Diff line number Diff line change
@@ -3012,6 +3012,11 @@ impl<'a> Parser<'a> {
}
};

let is_shorthand = parsed_field.as_ref().map_or(false, |f| f.ident.span == f.expr.span);
// A shorthand field can be turned into a full field with `:`.
// We should point this out.
self.check_or_expected(!is_shorthand, TokenType::Token(token::Colon));

match self.expect_one_of(&[token::Comma], &[token::CloseDelim(close_delim)]) {
Ok(_) => {
if let Some(f) = parsed_field.or(recovery_field) {
4 changes: 2 additions & 2 deletions src/test/ui/parser/issues/issue-52496.stderr
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ error: float literals must have an integer part
LL | let _ = Foo { bar: .5, baz: 42 };
| ^^ help: must have an integer part: `0.5`

error: expected one of `,` or `}`, found `.`
error: expected one of `,`, `:`, or `}`, found `.`
--> $DIR/issue-52496.rs:8:22
|
LL | let _ = Foo { bar.into(), bat: -1, . };
| --- ^ expected one of `,` or `}`
| --- ^ expected one of `,`, `:`, or `}`
| |
| while parsing this struct

4 changes: 2 additions & 2 deletions src/test/ui/parser/issues/issue-62973.stderr
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ LL |
LL |
| ^

error: expected one of `,` or `}`, found `{`
error: expected one of `,`, `:`, or `}`, found `{`
--> $DIR/issue-62973.rs:6:8
|
LL | fn p() { match s { v, E { [) {) }
| ^ - -^ expected one of `,` or `}`
| ^ - -^ expected one of `,`, `:`, or `}`
| | | |
| | | help: `}` may belong here
| | while parsing this struct
2 changes: 1 addition & 1 deletion src/test/ui/parser/removed-syntax-with-2.rs
Original file line number Diff line number Diff line change
@@ -6,6 +6,6 @@ fn main() {

let a = S { foo: (), bar: () };
let b = S { foo: (), with a };
//~^ ERROR expected one of `,` or `}`, found `a`
//~^ ERROR expected one of `,`, `:`, or `}`, found `a`
//~| ERROR missing field `bar` in initializer of `S`
}
4 changes: 2 additions & 2 deletions src/test/ui/parser/removed-syntax-with-2.stderr
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error: expected one of `,` or `}`, found `a`
error: expected one of `,`, `:`, or `}`, found `a`
--> $DIR/removed-syntax-with-2.rs:8:31
|
LL | let b = S { foo: (), with a };
| - ^ expected one of `,` or `}`
| - ^ expected one of `,`, `:`, or `}`
| |
| while parsing this struct