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 ICE when opaque captures a duplicated/invalid lifetime #135000

Merged
merged 1 commit into from
Jan 2, 2025

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Jan 1, 2025

See description on test.

Fixes #132766
Fixes #133693
Fixes #134780

@rustbot
Copy link
Collaborator

rustbot commented Jan 1, 2025

r? @estebank

rustbot has assigned @estebank.
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 Jan 1, 2025
@rust-log-analyzer

This comment has been minimized.

Copy link
Member

@lqd lqd left a comment

Choose a reason for hiding this comment

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

IIRC #131295 is not a dupe of the others so it shouldn't be fixed by this PR? Like, someone added an MCVE there by mistake that involved shadowing or something, like you've fixed here.

r=me with the blessed expectations + error annotation in the test, and the "fixes 131295" removed if it indeed shouldn't be present.

tests/ui/impl-trait/captured-invalid-lifetime.rs Outdated Show resolved Hide resolved
@lqd lqd assigned lqd and unassigned estebank Jan 1, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 1, 2025

Changes to the size of AST and/or HIR nodes.

cc @nnethercote

@compiler-errors
Copy link
Member Author

@bors r=lqd rollup

@bors
Copy link
Contributor

bors commented Jan 1, 2025

📌 Commit d3c6067 has been approved by lqd

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 Jan 1, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 1, 2025
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#134967 (handle submodules automatically on `doc` steps)
 - rust-lang#134973 (Fix typos)
 - rust-lang#134984 (`ObligationCause` construction tweaks in typeck)
 - rust-lang#134985 (Remove qualification of `std::cmp::Ordering` in `Ord` doc)
 - rust-lang#135000 (Fix ICE when opaque captures a duplicated/invalid lifetime)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 92dbfcc into rust-lang:master Jan 2, 2025
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 2, 2025
Rollup merge of rust-lang#135000 - compiler-errors:opaque-captures-dupe, r=lqd

Fix ICE when opaque captures a duplicated/invalid lifetime

See description on test.

Fixes rust-lang#132766
Fixes rust-lang#133693
Fixes rust-lang#134780
@rustbot rustbot added this to the 1.85.0 milestone Jan 2, 2025
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
6 participants