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 dyn and impl after for<...> #117891

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Recover dyn and impl after for<...> #117891

merged 1 commit into from
Nov 20, 2023

Conversation

compiler-errors
Copy link
Member

Recover dyn and impl after for<...> in types. Reuses the logic for parsing bare trait objects, so it doesn't fix cases like for<'a> dyn Trait + dyn Trait or anything, but that seems somewhat of a different issue.

Parsing recovery logic is a bit involved, but I couldn't find a way to simplify it.

Fixes #117882

@rustbot
Copy link
Collaborator

rustbot commented Nov 14, 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 Nov 14, 2023
davidtwco
davidtwco approved these changes Nov 19, 2023
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

@bors r+ rollup

@compiler-errors
Copy link
Member Author

@bors r=davidtwco rollup

@bors
Copy link
Contributor

bors commented Nov 19, 2023

📌 Commit a8a2ee4 has been approved by davidtwco

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, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Nov 20, 2023
@compiler-errors
Rollup merge of rust-lang#117891 - compiler-errors:recover-for-dyn, r…
7df7567 
…=davidtwco

Recover `dyn` and `impl` after `for<...>`

Recover `dyn` and `impl` after `for<...>` in types. Reuses the logic for parsing bare trait objects, so it doesn't fix cases like `for<'a> dyn Trait + dyn Trait` or anything, but that seems somewhat of a different issue.

Parsing recovery logic is a bit involved, but I couldn't find a way to simplify it.

Fixes rust-lang#117882
@compiler-errors compiler-errors mentioned this pull request Nov 20, 2023
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2023
@bors
Auto merge of rust-lang#118078 - compiler-errors:rollup-8ln8dvl, r=co…
68f060a 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115526 (Add arm64e-apple-ios & arm64e-apple-darwin targets)
 - rust-lang#115691 (Add `$message_type` field to distinguish json diagnostic outputs)
 - rust-lang#117828 (Avoid iterating over hashmaps in astconv)
 - rust-lang#117832 (interpret: simplify handling of shifts by no longer trying to handle signed and unsigned shift amounts in the same branch)
 - rust-lang#117891 (Recover `dyn` and `impl` after `for<...>`)
 - rust-lang#117957 (if available use a Child's pidfd for kill/wait)
 - rust-lang#117994 (Ignore but do not assume region obligations from unifying headers in negative coherence)
 - rust-lang#118068 (subtree update cg_gcc 2023/11/17)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2023
@bors
Auto merge of rust-lang#118078 - compiler-errors:rollup-8ln8dvl, r=co…
bdb8cb4 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115526 (Add arm64e-apple-ios & arm64e-apple-darwin targets)
 - rust-lang#115691 (Add `$message_type` field to distinguish json diagnostic outputs)
 - rust-lang#117828 (Avoid iterating over hashmaps in astconv)
 - rust-lang#117832 (interpret: simplify handling of shifts by no longer trying to handle signed and unsigned shift amounts in the same branch)
 - rust-lang#117891 (Recover `dyn` and `impl` after `for<...>`)
 - rust-lang#117957 (if available use a Child's pidfd for kill/wait)
 - rust-lang#117994 (Ignore but do not assume region obligations from unifying headers in negative coherence)
 - rust-lang#118068 (subtree update cg_gcc 2023/11/17)

r? `@ghost`
`@rustbot` modify labels: rollup
@compiler-errors compiler-errors mentioned this pull request Nov 20, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2023
@bors
Auto merge of rust-lang#118082 - compiler-errors:rollup-ejsc8yd, r=co…
95d5b88 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#117828 (Avoid iterating over hashmaps in astconv)
 - rust-lang#117832 (interpret: simplify handling of shifts by no longer trying to handle signed and unsigned shift amounts in the same branch)
 - rust-lang#117891 (Recover `dyn` and `impl` after `for<...>`)
 - rust-lang#117957 (if available use a Child's pidfd for kill/wait)
 - rust-lang#117988 (Handle attempts to have multiple `cfg`d tail expressions)
 - rust-lang#117994 (Ignore but do not assume region obligations from unifying headers in negative coherence)
 - rust-lang#118000 (Make regionck care about placeholders in outlives components)
 - rust-lang#118068 (subtree update cg_gcc 2023/11/17)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2023
@bors
Auto merge of rust-lang#118082 - compiler-errors:rollup-ejsc8yd, r=ma…
46ecc10 
…tthiaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#117828 (Avoid iterating over hashmaps in astconv)
 - rust-lang#117832 (interpret: simplify handling of shifts by no longer trying to handle signed and unsigned shift amounts in the same branch)
 - rust-lang#117891 (Recover `dyn` and `impl` after `for<...>`)
 - rust-lang#117957 (if available use a Child's pidfd for kill/wait)
 - rust-lang#117988 (Handle attempts to have multiple `cfg`d tail expressions)
 - rust-lang#117994 (Ignore but do not assume region obligations from unifying headers in negative coherence)
 - rust-lang#118000 (Make regionck care about placeholders in outlives components)
 - rust-lang#118068 (subtree update cg_gcc 2023/11/17)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a7f805d into rust-lang:master Nov 20, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 20, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2023
@rust-timer
Unrolled build for rust-lang#117891
71628b8 
Rollup merge of rust-lang#117891 - compiler-errors:recover-for-dyn, r=davidtwco

Recover `dyn` and `impl` after `for<...>`

Recover `dyn` and `impl` after `for<...>` in types. Reuses the logic for parsing bare trait objects, so it doesn't fix cases like `for<'a> dyn Trait + dyn Trait` or anything, but that seems somewhat of a different issue.

Parsing recovery logic is a bit involved, but I couldn't find a way to simplify it.

Fixes rust-lang#117882
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 3, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

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
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.

Improve syntax error for misplaced lifetime quantifier (for<'a>) outside of APIT type
4 participants
@compiler-errors @rustbot @bors @davidtwco