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

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

Merged
merged 4 commits into from
Mar 22, 2019
Merged

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

merged 4 commits into from
Mar 22, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Mar 8, 2019 •
edited
Loading

Fix #56579. Fix #56473.

@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 Mar 8, 2019
@estebank estebank changed the title Recover from missing comma between enum variants Recover from missing comma between enum variants and from bad pub kw Mar 8, 2019
@estebank
Copy link
Contributor Author

estebank commented Mar 8, 2019

r? @varkor

@rust-highfive rust-highfive assigned varkor and unassigned eddyb Mar 8, 2019
@estebank estebank force-pushed the recover-from-comaless branch from 408d916 to b80e00a Compare March 9, 2019 23:41
@estebank
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Mar 10, 2019

📌 Commit 14055db190c37c8ddec0da333e7fb64c87b4d590 has been approved by petrochenkov

@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 Mar 10, 2019
@bors
Copy link
Contributor

bors commented Mar 12, 2019

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

@bors bors 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
@varkor varkor assigned petrochenkov and unassigned varkor Mar 12, 2019
@estebank estebank force-pushed the recover-from-comaless branch from 14055db to eb0f2db Compare March 12, 2019 18:40
@estebank
Copy link
Contributor Author

@bors r=petrochenkov rebased

@bors
Copy link
Contributor

bors commented Mar 12, 2019

📌 Commit eb0f2db0c7fe2ca1231197fb11e1ae1bf9db4095 has been approved by petrochenkov

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

bors commented Mar 16, 2019

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

@bors bors 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 estebank force-pushed the recover-from-comaless branch from eb0f2db to 0a09e76 Compare March 17, 2019 00:48
@estebank
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Mar 17, 2019

📌 Commit 0a09e76 has been approved by petrochenkov

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

bors commented Mar 22, 2019

⌛ 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
Copy link
Contributor

bors commented Mar 22, 2019

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

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

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
merged-by-bors This PR was explicitly merged by bors. 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.
6 participants
@estebank @rust-highfive @bors @petrochenkov @eddyb @varkor