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

Cleanup macro matching recovery #104608

Merged
merged 1 commit into from
Nov 20, 2022
Merged

Cleanup macro matching recovery #104608

merged 1 commit into from
Nov 20, 2022

Conversation

Noratrieb
Copy link
Member

The retry has been implemented already in #104335. Also removes a HACK comment that's not really needed anymore because the "don't recover during macro matching" isn't really a hack but correct behavior.

The retry has been implemented already.
@rustbot
Copy link
Collaborator

rustbot commented Nov 19, 2022

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 19, 2022
@compiler-errors
Copy link
Member

<3

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 19, 2022

📌 Commit 825b8db has been approved by compiler-errors

It is now in the queue for this repository.

@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 Nov 19, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#103901 (Add tracking issue for `const_arguments_as_str`)
 - rust-lang#104112 (rustdoc: Add copy to the description of repeat)
 - rust-lang#104435 (`VecDeque::resize` should re-use the buffer in the passed-in element)
 - rust-lang#104467 (Fix substraction with overflow in `wrong_number_of_generic_args.rs`)
 - rust-lang#104608 (Cleanup macro matching recovery)
 - rust-lang#104626 (Fix doctest errors related to rustc_middle)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 28034bb into rust-lang:master Nov 20, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 20, 2022
@Noratrieb Noratrieb deleted the fixmed branch November 20, 2022 08:01
@Noratrieb Noratrieb restored the fixmed branch December 3, 2022 19:41
@Noratrieb Noratrieb deleted the fixmed branch December 23, 2022 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants