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

syntax: Better recovery for $ty::AssocItem and ty!()::AssocItem #59058

Merged
merged 3 commits into from
Mar 23, 2019
Merged

syntax: Better recovery for $ty::AssocItem and ty!()::AssocItem #59058

merged 3 commits into from
Mar 23, 2019

Conversation

petrochenkov
Copy link
Contributor

This PR improves on #46788 covering a few missing cases.

Fixes #52307
Fixes #53776
r? @estebank

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2019
estebank
estebank approved these changes Mar 10, 2019
View reviewed changes
Copy link
Contributor

@estebank estebank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me, leave it to you to decide whether to address the nitpicks.

src/libsyntax/parse/parser.rs Show resolved Hide resolved
src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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 Mar 11, 2019
This was referenced Mar 11, 2019
Closed
Closed
@petrochenkov
Copy link
Contributor Author

@bors r=estebank

@bors
Copy link
Contributor

bors commented Mar 12, 2019

📌 Commit 1ab8ca3 has been approved by estebank

@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
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 22, 2019
@Mark-Simulacrum
Rollup merge of rust-lang#59058 - petrochenkov:assocrecov3, r=estebank
1f2ba0d 
 syntax: Better recovery for `$ty::AssocItem` and `ty!()::AssocItem`

This PR improves on rust-lang#46788 covering a few missing cases.

Fixes rust-lang#52307
Fixes rust-lang#53776
r? @estebank
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Mar 22, 2019
Closed
@bors
Copy link
Contributor

bors commented Mar 23, 2019

⌛ Testing commit 1ab8ca3 with merge d51a437...

bors added a commit that referenced this pull request Mar 23, 2019
@bors
Auto merge of #59058 - petrochenkov:assocrecov3, r=estebank
d51a437 
 syntax: Better recovery for `$ty::AssocItem` and `ty!()::AssocItem`

This PR improves on #46788 covering a few missing cases.

Fixes #52307
Fixes #53776
r? @estebank
@bors
Copy link
Contributor

bors commented Mar 23, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 23, 2019
@bors bors merged commit 1ab8ca3 into rust-lang:master Mar 23, 2019
@bors bors mentioned this pull request Mar 23, 2019
Merged
@petrochenkov petrochenkov deleted the assocrecov3 branch June 5, 2019 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estebank estebank estebank approved these changes

Assignees

@estebank estebank

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.
4 participants
@petrochenkov @bors @estebank @rust-highfive