Skip to content

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Feb 8, 2023

Fixes #107796

cc #106712, @estebank and @Ezrashaw please make sure to use Parser::may_recover for all eager-token-consuming parser recoveries.

This also fixes a separate regression from #99915, that was introduced before we added may_recover though.

@rustbot
Copy link
Collaborator

rustbot commented Feb 8, 2023

r? @davidtwco

(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 Feb 8, 2023
@compiler-errors
Copy link
Member Author

Beta nominating because this is a beta regression. It's not super high priority, but the fix is simple.

@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 8, 2023
@estebank
Copy link
Contributor

estebank commented Feb 8, 2023

r? @estebank @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 8, 2023

📌 Commit 0017822 has been approved by estebank

It is now in the queue for this repository.

@rustbot rustbot assigned estebank and unassigned davidtwco Feb 8, 2023
@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 Feb 8, 2023
@estebank
Copy link
Contributor

estebank commented Feb 8, 2023

Safe to backport.

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Feb 9, 2023
…macro-is-ok, r=estebank

Do not eagerly recover for bad `impl Trait` types in macros

Fixes rust-lang#107796

cc rust-lang#106712, `@estebank` and `@Ezrashaw` please make sure to use [`Parser::may_recover`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/parser/struct.Parser.html#method.may_recover) for all eager-token-consuming parser recoveries.

This also fixes a separate regression from rust-lang#99915, that was introduced before we added `may_recover` though.
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Feb 9, 2023
…macro-is-ok, r=estebank

Do not eagerly recover for bad `impl Trait` types in macros

Fixes rust-lang#107796

cc rust-lang#106712, ``@estebank`` and ``@Ezrashaw`` please make sure to use [`Parser::may_recover`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/parser/struct.Parser.html#method.may_recover) for all eager-token-consuming parser recoveries.

This also fixes a separate regression from rust-lang#99915, that was introduced before we added `may_recover` though.
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2023
…mpiler-errors

Rollup of 9 pull requests

Successful merges:

 - rust-lang#107317 (Implement `AsFd` and `AsRawFd` for `Rc`)
 - rust-lang#107429 (Stabilize feature `cstr_from_bytes_until_nul`)
 - rust-lang#107713 (Extend `BYTE_SLICE_IN_PACKED_STRUCT_WITH_DERIVE`.)
 - rust-lang#107761 (Replace a command line flag with an env var to allow tools to initialize the tracing loggers at their own discretion)
 - rust-lang#107790 ( x.py fails all downloads that use a tempdir with snap curl rust-lang#107722)
 - rust-lang#107799 (correctly update goals in the cache)
 - rust-lang#107813 (Do not eagerly recover for bad `impl Trait` types in macros)
 - rust-lang#107817 (rustdoc: use svgo to shrink `wheel.svg`)
 - rust-lang#107819 (Set `rust-analyzer.check.invocationLocation` to `root`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ab09405 into rust-lang:master Feb 9, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 9, 2023
@pnkfelix
Copy link
Contributor

pnkfelix commented Feb 9, 2023

Discussed in T-compiler triage meeting.

@rustbot label: +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 9, 2023
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 14, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.69.0, 1.68.0 Feb 14, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2023
…mulacrum

[beta] backport

*  Do not eagerly recover for bad impl Trait types in macros rust-lang#107813
*  Fix infinite loop in rustdoc get_all_import_attributes function rust-lang#107357
*  Bring tests back into rustc source tarball rust-lang#107239

r? `@Mark-Simulacrum`
@compiler-errors compiler-errors deleted the bad-impl-trait-in-macro-is-ok branch August 11, 2023 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.

Breaking change in macro_rules ty fragment parsing in version 1.68
7 participants