Skip to content

Recover from missing comma between enum variants and from bad pub kw - #59031

Merged
bors merged 4 commits into
rust-lang:masterfrom
estebank:recover-from-comaless
Mar 22, 2019
Merged

Recover from missing comma between enum variants and from bad pub kw#59031
bors merged 4 commits into
rust-lang:masterfrom
estebank:recover-from-comaless

Conversation

@estebank

@estebankestebank commented Mar 8, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

Fix#56579. Fix#56473.

@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 Mar 8, 2019
@estebankestebank changed the title Recover from missing comma between enum variantsRecover from missing comma between enum variants and from bad pub kwMar 8, 2019
@estebank

estebank commented Mar 8, 2019

Copy link
Copy Markdown
ContributorAuthor

r? @varkor

@rust-highfiverust-highfive assigned varkor and unassigned eddybMar 8, 2019
petrochenkov
petrochenkov reviewed Mar 9, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Mar 9, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
@estebank
estebankforce-pushed the recover-from-comaless branch from 408d916 to b80e00aCompareMarch 9, 2019 23:41
@estebank

estebank commented Mar 10, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=petrochenkov

@bors

bors commented Mar 10, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 14055db190c37c8ddec0da333e7fb64c87b4d590 has been approved by petrochenkov

@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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 10, 2019
@bors

bors commented Mar 12, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #59044) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 12, 2019
@varkorvarkor assigned petrochenkov and unassigned varkorMar 12, 2019
@estebank
estebankforce-pushed the recover-from-comaless branch from 14055db to eb0f2dbCompareMarch 12, 2019 18:40
@estebank

estebank commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=petrochenkov rebased

@bors

bors commented Mar 12, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit eb0f2db0c7fe2ca1231197fb11e1ae1bf9db4095 has been approved by petrochenkov

@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 Mar 12, 2019
@bors

bors commented Mar 16, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #59226) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 16, 2019
@estebank
estebankforce-pushed the recover-from-comaless branch from eb0f2db to 0a09e76CompareMarch 17, 2019 00:48
@estebank

estebank commented Mar 17, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=petrochenkov

@bors

bors commented Mar 17, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 0a09e76 has been approved by petrochenkov

@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 Mar 17, 2019
@bors

bors commented Mar 22, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0a09e76 with merge a85ec7c...

bors added a commit that referenced this pull request Mar 22, 2019
@bors
Auto merge of#59031- estebank:recover-from-comaless, r=petrochenkov
a85ec7c
Recover from missing comma between enum variants and from bad `pub` kw
Fix#56579. Fix#56473.
@bors

bors commented Mar 22, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: petrochenkov
Pushing a85ec7c to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 22, 2019
@bors
bors merged commit 0a09e76 into rust-lang:masterMar 22, 2019
@borsbors mentioned this pull request Mar 22, 2019
Closed
@estebank
estebank deleted the recover-from-comaless branch November 9, 2023 05:20
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@petrochenkovpetrochenkov

Labels

merged-by-borsThis PR was explicitly merged by bors.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.

6 participants

@estebank@rust-highfive@bors@petrochenkov@eddyb@varkor