Skip to content

Lifetime variance fixes for rustdoc - #97288

Merged
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:tcxify-rustdoc
May 24, 2022
Merged

Lifetime variance fixes for rustdoc#97288
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:tcxify-rustdoc

Conversation

@compiler-errors

Copy link
Copy Markdown
Contributor

#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 everything is 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 rustdoc team can review independently.

@rustbotrustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label May 22, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @CraftSpider

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 22, 2022
@rust-log-analyzer

This comment has been minimized.

@Dylan-DPC

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit b2a95cb has been approved by Dylan-DPC

@borsbors 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 24, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 24, 2022
…ylan-DPC
Lifetime variance fixes for rustdoc
rust-lang#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 everything is already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`.
Split out from rust-lang#97287 so the rustdoc team can review independently.
@Dylan-DPCDylan-DPC mentioned this pull request May 24, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 24, 2022
…ylan-DPC
Lifetime variance fixes for rustdoc
rust-lang#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 everything is already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`.
Split out from rust-lang#97287 so the rustdoc team can review independently.
@Dylan-DPCDylan-DPC mentioned this pull request May 24, 2022
@Dylan-DPCDylan-DPC mentioned this pull request May 24, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2022
Rollup of 4 pull requests
Successful merges:
- rust-lang#97288 (Lifetime variance fixes for rustdoc)
- rust-lang#97298 (Parse expression after `else` as a condition if followed by `{`)
- rust-lang#97308 (Stabilize `cell_filter_map`)
- rust-lang#97321 (explain how to turn integers into fn ptrs)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 3569a42 into rust-lang:masterMay 24, 2022
@rustbotrustbot added this to the 1.63.0 milestone May 24, 2022
@compiler-errors
compiler-errors deleted the tcxify-rustdoc branch August 11, 2023 20:20
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@compiler-errors@rust-highfive@rust-log-analyzer@Dylan-DPC@bors@GuillaumeGomez@CraftSpider@rustbot