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.

Sign up for GitHub

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

Jump to bottom

parser: recover on nested ADTs as enum variants #66641

Merged
merged 3 commits into from
Nov 24, 2019
Merged

parser: recover on nested ADTs as enum variants #66641

merged 3 commits into from
Nov 24, 2019

Conversation

VirrageS
Copy link
Contributor

Closes: #66127

@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 22, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@Centril
Copy link
Contributor

Centril commented Nov 22, 2019

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned davidtwco Nov 22, 2019
Centril
Centril suggested changes Nov 22, 2019
View reviewed changes
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/test/ui/enum/nested-enum.rs Outdated Show resolved Hide resolved
@Centril Centril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 22, 2019
Centril
Centril reviewed Nov 22, 2019
View reviewed changes
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
@bors

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
Centril
Centril reviewed Nov 23, 2019
View reviewed changes
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

Sign in to view
@Centril Centril changed the title Add error reporting on nested 'enum' keywords parser: recover on on nested ADTs as enum variants Nov 23, 2019
@VirrageS VirrageS changed the title parser: recover on on nested ADTs as enum variants parser: recover on nested ADTs as enum variants Nov 23, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
Centril
Centril reviewed Nov 23, 2019
View reviewed changes
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
@Centril
Copy link
Contributor

Centril commented Nov 23, 2019

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Nov 23, 2019

📌 Commit 9300c3b has been approved by Centril

@bors
Copy link
Contributor

bors commented Nov 23, 2019

🌲 The tree is currently closed for pull requests below priority 10, this pull request will be tested once the tree is reopened

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 23, 2019
Centril added a commit to Centril/rust that referenced this pull request Nov 24, 2019
@Centril
Rollup merge of rust-lang#66641 - VirrageS:master, r=Centril
980ccaa 
parser: recover on nested ADTs as enum variants

Closes: rust-lang#66127
@Centril Centril mentioned this pull request Nov 24, 2019
Merged
bors added a commit that referenced this pull request Nov 24, 2019
@bors
Auto merge of #66686 - Centril:rollup-07slyoo, r=Centril
e41ced3 
Rollup of 5 pull requests

Successful merges:

 - #64856 (Scope format! temporaries)
 - #66411 (mem::forget docs: mention ManuallyDrop)
 - #66594 (Fix cycle when debug-printing opaque types)
 - #66641 (parser: recover on nested ADTs as enum variants)
 - #66659 (make `./x.py bench` again)

Failed merges:

r? @ghost
@bors bors merged commit 9300c3b into rust-lang:master Nov 24, 2019
@VirrageS VirrageS mentioned this pull request Nov 24, 2019
Merged
tmandry added a commit to tmandry/rust that referenced this pull request Nov 27, 2019
@tmandry
Rollup merge of rust-lang#66718 - VirrageS:use_comma, r=Centril
71f20b8 
Refactor `parse_enum_item` to use `parse_delim_comma_seq`

Followup after rust-lang#66641

Some errors got more verbose but I think they make sense with the help message.
@Centril Centril mentioned this pull request Dec 2, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril requested changes

Assignees

@Centril Centril

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Gracefully recover from incorrectly nested items
5 participants
@VirrageS @rust-highfive @Centril @bors @davidtwco