Skip to content

parser: recover on nested ADTs as enum variants - #66641

Merged
bors merged 3 commits into
rust-lang:masterfrom
VirrageS:master
Nov 24, 2019
Merged

parser: recover on nested ADTs as enum variants#66641
bors merged 3 commits into
rust-lang:masterfrom
VirrageS:master

Conversation

@VirrageS

@VirrageSVirrageS commented Nov 22, 2019

Copy link
Copy Markdown
Contributor

Closes: #66127

@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfiverust-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

Centril commented Nov 22, 2019

Copy link
Copy Markdown
Contributor

r? @Centril

Centril
Centril suggested changes Nov 22, 2019
View reviewed changes
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/test/ui/enum/nested-enum.rs Outdated
@CentrilCentril 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
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
@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
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@CentrilCentril changed the title Add error reporting on nested 'enum' keywordsparser: recover on on nested ADTs as enum variantsNov 23, 2019
@VirrageSVirrageS changed the title parser: recover on on nested ADTs as enum variantsparser: recover on nested ADTs as enum variantsNov 23, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
Centril
Centril reviewed Nov 23, 2019
View reviewed changes
Comment threadsrc/librustc_parse/parser/item.rs Outdated
Comment threadsrc/librustc_parse/parser/item.rs Outdated
@Centril

Centril commented Nov 23, 2019

Copy link
Copy Markdown
Contributor

Thanks! @bors r+

@bors

bors commented Nov 23, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 9300c3b has been approved by Centril

@bors

bors commented Nov 23, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 ofrust-lang#66641- VirrageS:master, r=Centril
980ccaa
parser: recover on nested ADTs as enum variants
Closes: rust-lang#66127
@CentrilCentril 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:masterNov 24, 2019
@VirrageSVirrageS 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 ofrust-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.
@CentrilCentril mentioned this pull request Dec 2, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@CentrilCentrilCentril requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

S-waiting-on-borsStatus: 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