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

Lifetime variance fixes for rustc #97292

Merged
merged 1 commit into from
May 23, 2022
Merged

Conversation

compiler-errors
Copy link
Member

#97287 migrates rustc to a Ty type that is invariant over its lifetime 'tcx, so I need to fix a bunch of places that assume that Ty<'a> and Ty<'b> can be unified by shortening both to some common lifetime.

This is doable, since many lifetimes are already 'tcx, so all this PR does is be a bit more explicit that elided lifetimes are actually 'tcx.

Split out from #97287 so the compiler team can review independently.

@rust-highfive
Copy link
Collaborator

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 22, 2022
@rust-highfive
Copy link
Collaborator

r? @davidtwco

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 22, 2022
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.

I'm not familiar with all of the parts of the compiler this changes, but this seems fairly straigthforward so LGTM.

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 23, 2022

📌 Commit 1784634 has been approved by davidtwco

@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 May 23, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2022
Rollup of 4 pull requests

Successful merges:

 - rust-lang#96129 (Document rounding for floating-point primitive operations and string parsing)
 - rust-lang#97286 (Add new eslint rule to prevent whitespace before function call paren)
 - rust-lang#97292 (Lifetime variance fixes for rustc)
 - rust-lang#97309 (Add some regression tests for rust-lang#90400)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f4bf64c into rust-lang:master May 23, 2022
@rustbot rustbot added this to the 1.63.0 milestone May 23, 2022
@compiler-errors compiler-errors deleted the tcxify-rustc branch August 11, 2023 20:20
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.

5 participants