Skip to content

Lower extra lifetimes before normal generic params. #143430

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
Merged
merged 2 commits into from
Jul 21, 2025
Merged

Lower extra lifetimes before normal generic params. #143430

merged 2 commits into from
Jul 21, 2025

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jul 4, 2025

Fixes #143413

@rustbot
Copy link
Collaborator

rustbot commented Jul 4, 2025

r? @oli-obk

rustbot has assigned @oli-obk.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Jul 4, 2025
oli-obk
oli-obk reviewed Jul 4, 2025
View reviewed changes
tests/ui/lifetimes/elided-lifetime-in-const-param-type.rs Outdated
//! at the end of the `for` binder. Verify that lowering creates the definition for that extra
//! lifetime parameter before lowering `c(&())`.

type A = for<const B: c(&())> D;
Copy link
Contributor

Choose a reason for hiding this comment

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

Unrelated error minimization:

#![feature(non_lifetime_binders)]
#![expect(incomplete_features)]

trait D {}

type A = dyn for<const B: c(&())> D;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The attributes introduce even more errors, as they trigger some validation.

@matthiaskrgr
Copy link
Member

meh, I was hoping this would fix #122903 as well 🙈

@cjgillot cjgillot force-pushed the extra-lifetime-swap branch from 66203ad to 7da6fd1 Compare July 20, 2025 13:26
@oli-obk
Copy link
Contributor

oli-obk commented Jul 21, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 21, 2025

📌 Commit 7da6fd1 has been approved by oli-obk

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 Jul 21, 2025
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jul 21, 2025
@jieyouxu
Rollup merge of rust-lang#143430 - cjgillot:extra-lifetime-swap, r=ol…
54a790d 
…i-obk

Lower extra lifetimes before normal generic params.

Fixes rust-lang#143413
@jieyouxu jieyouxu mentioned this pull request Jul 21, 2025
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jul 21, 2025
@jieyouxu
Rollup merge of rust-lang#143430 - cjgillot:extra-lifetime-swap, r=ol…
713d04a 
…i-obk

Lower extra lifetimes before normal generic params.

Fixes rust-lang#143413
@jieyouxu jieyouxu mentioned this pull request Jul 21, 2025
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jul 21, 2025
@jieyouxu
Rollup merge of rust-lang#143430 - cjgillot:extra-lifetime-swap, r=ol…
0cb38d8 
…i-obk

Lower extra lifetimes before normal generic params.

Fixes rust-lang#143413
@jieyouxu jieyouxu mentioned this pull request Jul 21, 2025
Closed
bors added a commit that referenced this pull request Jul 21, 2025
@bors
Auto merge of #144262 - jieyouxu:rollup-wxgtyr0, r=jieyouxu
006f365 
Rollup of 15 pull requests

Successful merges:

 - #142097 (gpu offload host code generation)
 - #143430 (Lower extra lifetimes before normal generic params.)
 - #143672 (Fix Box allocator drop elaboration)
 - #143768 (Constify Try, From, TryFrom and relevant traits)
 - #143816 (Implement `check` for compiletest and RA using tool macro)
 - #143985 (rustc_public: de-StableMIR-ize)
 - #144027 (clippy: make tests work in stage 1)
 - #144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename)
 - #144176 (Add approval blocking labels for new bors)
 - #144187 (fix handling of base address for TypeId allocations)
 - #144212 (Remove the ptr_unique lang item)
 - #144243 (Subtree update of `rust-analyzer`)
 - #144246 (Don't use another main test file as auxiliary)
 - #144251 (rustc-dev-guide subtree update)
 - #144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu jieyouxu mentioned this pull request Jul 21, 2025
Merged
bors added a commit that referenced this pull request Jul 21, 2025
@bors
Auto merge of #144269 - jieyouxu:rollup-137ysl2, r=jieyouxu
9748d87 
Rollup of 14 pull requests

Successful merges:

 - #142097 (gpu offload host code generation)
 - #143430 (Lower extra lifetimes before normal generic params.)
 - #143768 (Constify Try, From, TryFrom and relevant traits)
 - #143816 (Implement `check` for compiletest and RA using tool macro)
 - #143985 (rustc_public: de-StableMIR-ize)
 - #144027 (clippy: make tests work in stage 1)
 - #144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename)
 - #144176 (Add approval blocking labels for new bors)
 - #144187 (fix handling of base address for TypeId allocations)
 - #144212 (Remove the ptr_unique lang item)
 - #144243 (Subtree update of `rust-analyzer`)
 - #144246 (Don't use another main test file as auxiliary)
 - #144251 (rustc-dev-guide subtree update)
 - #144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a99f3af into rust-lang:master Jul 21, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 21, 2025
rust-timer added a commit that referenced this pull request Jul 21, 2025
@rust-timer
Unrolled build for #143430
935824e 
Rollup merge of #143430 - cjgillot:extra-lifetime-swap, r=oli-obk

Lower extra lifetimes before normal generic params.

Fixes #143413
@cjgillot cjgillot deleted the extra-lifetime-swap branch July 21, 2025 23:11
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jul 22, 2025
@bors
Auto merge of #144269 - jieyouxu:rollup-137ysl2, r=jieyouxu
44b1876 
Rollup of 14 pull requests

Successful merges:

 - rust-lang/rust#142097 (gpu offload host code generation)
 - rust-lang/rust#143430 (Lower extra lifetimes before normal generic params.)
 - rust-lang/rust#143768 (Constify Try, From, TryFrom and relevant traits)
 - rust-lang/rust#143816 (Implement `check` for compiletest and RA using tool macro)
 - rust-lang/rust#143985 (rustc_public: de-StableMIR-ize)
 - rust-lang/rust#144027 (clippy: make tests work in stage 1)
 - rust-lang/rust#144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename)
 - rust-lang/rust#144176 (Add approval blocking labels for new bors)
 - rust-lang/rust#144187 (fix handling of base address for TypeId allocations)
 - rust-lang/rust#144212 (Remove the ptr_unique lang item)
 - rust-lang/rust#144243 (Subtree update of `rust-analyzer`)
 - rust-lang/rust#144246 (Don't use another main test file as auxiliary)
 - rust-lang/rust#144251 (rustc-dev-guide subtree update)
 - rust-lang/rust#144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jul 24, 2025
@bors
Auto merge of #144269 - jieyouxu:rollup-137ysl2, r=jieyouxu
7a77909 
Rollup of 14 pull requests

Successful merges:

 - rust-lang/rust#142097 (gpu offload host code generation)
 - rust-lang/rust#143430 (Lower extra lifetimes before normal generic params.)
 - rust-lang/rust#143768 (Constify Try, From, TryFrom and relevant traits)
 - rust-lang/rust#143816 (Implement `check` for compiletest and RA using tool macro)
 - rust-lang/rust#143985 (rustc_public: de-StableMIR-ize)
 - rust-lang/rust#144027 (clippy: make tests work in stage 1)
 - rust-lang/rust#144080 (Mitigate `#[align]` name resolution ambiguity regression with a rename)
 - rust-lang/rust#144176 (Add approval blocking labels for new bors)
 - rust-lang/rust#144187 (fix handling of base address for TypeId allocations)
 - rust-lang/rust#144212 (Remove the ptr_unique lang item)
 - rust-lang/rust#144243 (Subtree update of `rust-analyzer`)
 - rust-lang/rust#144246 (Don't use another main test file as auxiliary)
 - rust-lang/rust#144251 (rustc-dev-guide subtree update)
 - rust-lang/rust#144254 (opt-dist: make `artifact-dir` an absolute path for `opt-dist local`)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

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.90.0
Development

Successfully merging this pull request may close these issues.

ICE: no entry for node id: NodeId(27)
5 participants
@cjgillot @rustbot @matthiaskrgr @oli-obk @bors