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

fix: not insert missing lifetime for ConstParamTy #114606

Merged
merged 1 commit into from
Aug 9, 2023

Conversation

bvanjoi
Copy link
Contributor

@bvanjoi bvanjoi commented Aug 8, 2023

Fixes #113462

We should ignore the missing lifetime, as it's illegal to include a lifetime in a const param.

r? @compiler-errors

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

compiler-errors commented Aug 8, 2023

I think a better fix would just be to not recover the lifetime by modifying this line to consider ConstParamTy rib kind here:

.take_while(|rib| !matches!(rib.kind, LifetimeRibKind::Item))

@compiler-errors
Copy link
Member

You probably then also want to fix it here to avoid another useless suggestion:

LifetimeRibKind::Item => break,

@compiler-errors compiler-errors 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 Aug 8, 2023
@bvanjoi
Copy link
Contributor Author

bvanjoi commented Aug 8, 2023

ci is green.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 8, 2023
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 8, 2023

📌 Commit 078b942 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 Aug 8, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 8, 2023
fix: not insert missing lifetime for `ConstParamTy`

Fixes rust-lang#113462

We should ignore the missing lifetime, as it's illegal to include a lifetime in a const param.

r? `@compiler-errors`
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 9, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#113939 (open pidfd in child process and send to the parent via SOCK_SEQPACKET+CMSG)
 - rust-lang#114548 (Migrate a trait selection error to use diagnostic translation)
 - rust-lang#114606 (fix: not insert missing lifetime for `ConstParamTy`)
 - rust-lang#114634 (Mention riscv64-linux-android support in Android documentation)
 - rust-lang#114638 (Remove old RPITIT tests (revisions were removed))
 - rust-lang#114641 (Rename copying `ascii::Char` methods from `as_` to `to_`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 41d2694 into rust-lang:master Aug 9, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 9, 2023
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.

ICE: const parameters cannot be generic
4 participants