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.

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

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

Merged
merged 3 commits into from Mar 23, 2019

Conversation

Projects
None yet
4 participants
@petrochenkov
Copy link
Contributor

commented Mar 10, 2019

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

Fixes #52307
Fixes #53776
r? @estebank

@estebank
Copy link
Contributor

left a comment

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

Show resolved Hide resolved src/libsyntax/parse/parser.rs
Show resolved Hide resolved src/libsyntax/parse/parser.rs Outdated

@petrochenkov petrochenkov force-pushed the petrochenkov:assocrecov3 branch from 0bafb4a to 1ab8ca3 Mar 12, 2019

@petrochenkov

This comment has been minimized.

Copy link
Contributor Author

commented Mar 12, 2019

@bors r=estebank

@bors

This comment has been minimized.

Copy link
Contributor

commented Mar 12, 2019

📌 Commit 1ab8ca3 has been approved by estebank

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 22, 2019

Rollup merge of rust-lang#59058 - petrochenkov:assocrecov3, r=estebank
 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
@bors

This comment has been minimized.

Copy link
Contributor

commented Mar 23, 2019

⌛️ Testing commit 1ab8ca3 with merge d51a437...

bors added a commit that referenced this pull request Mar 23, 2019

Auto merge of #59058 - petrochenkov:assocrecov3, r=estebank
 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

This comment has been minimized.

Copy link
Contributor

commented Mar 23, 2019

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

@bors bors added the merged-by-bors label Mar 23, 2019

@bors bors merged commit 1ab8ca3 into rust-lang:master Mar 23, 2019

1 check passed

homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.