Skip to content

Recover from parse errors in literal struct fields and incorrect float literals#57779

Merged
bors merged 6 commits intorust-lang:masterfrom
estebank:recover-struct-fields
Jan 24, 2019
Merged

Recover from parse errors in literal struct fields and incorrect float literals#57779
bors merged 6 commits intorust-lang:masterfrom
estebank:recover-struct-fields

Conversation

@estebank
Copy link
Copy Markdown
Contributor

Fix #52496.

Attempt to recover from parse errors while parsing a struct's literal fields
by skipping tokens until a comma or the closing brace is found. This allows
errors in other fields to be reported.
@rust-highfive
Copy link
Copy Markdown
Contributor

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 20, 2019
Comment thread src/test/ui/issues/issue-52496.rs Outdated
Comment thread src/test/ui/issues/issue-52496.rs Outdated
Comment thread src/libsyntax/parse/parser.rs Outdated
Comment thread src/test/ui/issues/issue-52496.stderr Outdated
@estebank estebank changed the title Recover from parse errors in literal struct fields Recover from parse errors in literal struct fields and incorrect float literals Jan 20, 2019
Comment thread src/test/ui/parser/removed-syntax-with-1.rs Outdated
@michaelwoerister
Copy link
Copy Markdown
Member

It seems like @davidtwco and @oli-obk have already taken a look at this. Feel free r+ if you think this is good to go. (Otherwise I'll take a closer look tomorrow)

@estebank
Copy link
Copy Markdown
Contributor Author

@bors r=davidtwco

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jan 22, 2019

📌 Commit 4745b86 has been approved by davidtwco

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 22, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 23, 2019
…avidtwco

Recover from parse errors in literal struct fields and incorrect float literals

Fix rust-lang#52496.
Centril added a commit to Centril/rust that referenced this pull request Jan 23, 2019
…avidtwco

Recover from parse errors in literal struct fields and incorrect float literals

Fix rust-lang#52496.
bors added a commit that referenced this pull request Jan 24, 2019
Rollup of 11 pull requests

Successful merges:

 - #57179 (Update std/lib.rs docs to reflect Rust 2018 usage)
 - #57730 (Merge visitors in AST validation)
 - #57779 (Recover from parse errors in literal struct fields and incorrect float literals)
 - #57793 (Explain type mismatch cause pointing to return type when it is `impl Trait`)
 - #57795 (Use structured suggestion in stead of notes)
 - #57817 (Add error for trailing angle brackets.)
 - #57834 (Stabilize Any::get_type_id and rename to type_id)
 - #57836 (Fix some cross crate existential type ICEs)
 - #57840 (Fix issue 57762)
 - #57844 (use port 80 for retrieving GPG key)
 - #57858 (Ignore line ending on older git versions)

Failed merges:

r? @ghost
@bors bors merged commit 4745b86 into rust-lang:master Jan 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants