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

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

Merged
merged 6 commits into from Jan 24, 2019

Conversation

@estebank
Copy link
Contributor

estebank commented Jan 20, 2019

Fix #52496.

estebank added some commits Jan 20, 2019

Recover from parse errors in struct literal fields
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

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 20, 2019

r? @michaelwoerister

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

Show resolved Hide resolved src/libsyntax/parse/parser.rs 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

@michaelwoerister

This comment has been minimized.

Copy link
Contributor

michaelwoerister commented Jan 21, 2019

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

This comment has been minimized.

Copy link
Contributor Author

estebank commented Jan 22, 2019

@bors r=davidtwco

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 22, 2019

📌 Commit 4745b86 has been approved by davidtwco

Centril added a commit to Centril/rust that referenced this pull request Jan 23, 2019

Rollup merge of rust-lang#57779 - estebank:recover-struct-fields, r=d…
…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 23, 2019

Auto merge of #57850 - Centril:rollup, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #55448 (Add 'partition_at_index/_by/_by_key' for slices.)
 - #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)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jan 23, 2019

Auto merge of #57850 - Centril:rollup, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #55448 (Add 'partition_at_index/_by/_by_key' for slices.)
 - #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)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jan 23, 2019

Auto merge of #57850 - Centril:rollup, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #55448 (Add 'partition_at_index/_by/_by_key' for slices.)
 - #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)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jan 23, 2019

Auto merge of #57850 - Centril:rollup, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #55448 (Add 'partition_at_index/_by/_by_key' for slices.)
 - #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)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jan 23, 2019

Rollup merge of rust-lang#57779 - estebank:recover-struct-fields, r=d…
…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

Auto merge of #57869 - Centril:rollup, r=Centril
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