rustc: replace `TyCtxt<'a, 'gcx, 'tcx>` with `TyCtxt<'gcx, 'tcx>`. by eddyb · Pull Request #61722 · rust-lang/rust

eddyb · 2019-06-10T16:23:06Z

This first lifetime parameter of TyCtxt has been phantom for a while, thanks to @Zoxc, but was never removed, and I'm doing this now in preparation for removing the 'gcx/'tcx split.

I wasn't going to do this as a separate step, and instead start converting uses of TyCtxt to a single-lifetime alias of it (e.g. type TyCx<'tcx> = TyCtxt<'tcx, 'tcx, 'tcx>;) but it turns out (as @Zoxc rightly predicted) that there is far more fallout from not needing a lifetime for the first parameter of TyCtxt.

That is, going from TyCtxt<'a, 'gcx, 'tcx> to TyCtxt<'tcx, 'gcx, 'tcx> (the first commit in this PR) has the largest amount of fallout out of all the changes we might make (because it can require removing the 'a parameter of structs containing tcx: TyCtxt<'a, ...>), and is the hardest to automate (because 'a is used everywhere, not just with TyCtxt, unlike, say 'gcx, 'tcx -> 'tcx).

So I'm submitting this now to get it out of the way and reduce further friction in the future.

EDIT: for the rustfmt commit, I used rust-lang/rustfmt#1324 (comment), and manually filtered out some noise, like in #61735, but unlike that PR, there was also a weird bug to work around.
It should be reviewed separately, and dropped if unwanted.

cc @rust-lang/compiler r? @nikomatsakis

@Zoxc

Add deny(unused_lifetimes) to all the crates that have deny(internal). @Zoxc brought up, regarding #61722, that we don't force the removal of unused lifetimes. Turns out that it's not that bad to enable for compiler crates (I wonder why it's not `warn` by default?). I would've liked to enable `single_use_lifetimes` as well, but #53738 makes it unusable for now. For the `rustfmt` commit, I used rust-lang/rustfmt#1324 (comment), and manually filtered out some noise. r? @oli-obk cc @rust-lang/compiler

oli-obk

r=me with leftover unnecessary lifetimes removed

oli-obk · 2019-06-12T11:03:41Z

src/librustc/infer/nll_relate/mod.rs

 }

-impl<D> TypeRelation<'me, 'gcx, 'tcx> for TypeRelating<'me, 'gcx, 'tcx, D>
+impl<D> TypeRelation<'gcx, 'tcx> for TypeRelating<'me, 'gcx, 'tcx, D>


The 'me lifetime can be '_ here.

I believe that'd be handled by the "single-use lifetime" lint, which we haven't turned on yet.

src/librustc_codegen_llvm/base.rs

eddyb · 2019-06-12T13:03:09Z

@bors rollup=never p=10 (high bitrot probability)

eddyb · 2019-06-12T13:19:04Z

@bors r=oli-obk

bors · 2019-06-12T13:19:05Z

📌 Commit 4c98cb6 has been approved by oli-obk

bors · 2019-06-12T13:41:50Z

⌛ Testing commit 4c98cb6 with merge 24ddd16...

@Zoxc

rustc: replace `TyCtxt<'a, 'gcx, 'tcx>` with `TyCtxt<'gcx, 'tcx>`. This first lifetime parameter of `TyCtxt` has been phantom for a while, thanks to @Zoxc, but was never removed, and I'm doing this now in preparation for removing the `'gcx`/`'tcx` split. I wasn't going to do this as a separate step, and instead start converting uses of `TyCtxt` to a single-lifetime alias of it (e.g. `type TyCx<'tcx> = TyCtxt<'tcx, 'tcx, 'tcx>;`) but it turns out (as @Zoxc rightly predicted) that there is far more fallout from not needing a lifetime for the first parameter of `TyCtxt`. That is, going from `TyCtxt<'a, 'gcx, 'tcx>` to `TyCtxt<'tcx, 'gcx, 'tcx>` (the first commit in this PR) has the largest amount of fallout out of all the changes we might make (because it can require removing the `'a` parameter of `struct`s containing `tcx: TyCtxt<'a, ...>`), and is the hardest to automate (because `'a` is used everywhere, not just with `TyCtxt`, unlike, say `'gcx, 'tcx` -> `'tcx`). So I'm submitting this now to get it out of the way and reduce further friction in the future. **EDIT**: for the `rustfmt` commit, I used rust-lang/rustfmt#1324 (comment), and manually filtered out some noise, like in #61735, but unlike that PR, there was also a weird bug to work around. It should be reviewed separately, and dropped if unwanted. cc @rust-lang/compiler r? @nikomatsakis

bors · 2019-06-12T16:29:50Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 24ddd16 to master...

rust-highfive · 2019-06-12T16:32:20Z

📣 Toolstate changed by #61722!

Tested on commit 24ddd16.
Direct link to PR: #61722

💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

@Xanewok

Tested on commit rust-lang/rust@24ddd16. Direct link to PR: <rust-lang/rust#61722> 💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

Fix wrong lifetime of TyCtxt Rustup rust-lang/rust#61722 changelog: none

@Zoxc

Unify all uses of 'gcx and 'tcx. This is made possible by @Zoxc landing #57214 (see #57214 (comment) for the decision). A bit of context for the approach: just like #61722, this is *not* how I originally intended to go about this, but @Zoxc and my own experimentation independently resulted in the same conclusion: The interim alias `type TyCx<'tcx> = TyCtxt<'tcx, 'tcx>;` attempt required more work (adding `use`s), even only for handling the `TyCtxt<'tcx, 'tcx>` case and not the general `TyCtxt<'gcx, 'tcx>` one. What this PR is based on is the realization that `'gcx` is a special-enough name that it can be replaced, without caring for context, with `'tcx`, and then repetitions of the name `'tcx` be compacted away. After that, only a small number of error categories remained, each category easily dealt with with either more mass replacements (e.g. `TyCtxt<'tcx, '_>` -> `TyCtxt<'tcx>`) or by hand. For the `rustfmt` commit, I used rust-lang/rustfmt#1324 (comment), and manually filtered out some noise, like in #61735 and #61722, and like the latter, there was also a weird bug to work around. It should be reviewed separately, and dropped if unwanted (in this PR it's pretty significant). cc @rust-lang/compiler r? @nikomatsakis

rust-highfive assigned nikomatsakis Jun 10, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 10, 2019

This comment has been minimized.

Sign in to view

eddyb force-pushed the vowel-exclusion-zone branch from 63cfc09 to 23755eb Compare June 10, 2019 18:50

This comment has been minimized.

Sign in to view

eddyb force-pushed the vowel-exclusion-zone branch from 23755eb to 3ae6b4f Compare June 11, 2019 07:08

eddyb mentioned this pull request Jun 11, 2019

Add deny(unused_lifetimes) to all the crates that have deny(internal). #61735

Merged

eddyb force-pushed the vowel-exclusion-zone branch 2 times, most recently from 1b99bba to 0472b6c Compare June 11, 2019 21:13

This comment has been minimized.

Sign in to view

eddyb force-pushed the vowel-exclusion-zone branch 2 times, most recently from 8af839a to 18f8668 Compare June 12, 2019 10:15

eddyb added 5 commits June 12, 2019 13:38

rustc: replace TyCtxt<'a, 'gcx, 'tcx> with TyCtxt<'tcx, 'gcx, 'tcx>.

37799a5

Fix fallout from deny(unused_lifetimes).

2441253

rustc: replace TyCtxt<'tcx, 'gcx, 'tcx> with TyCtxt<'gcx, 'tcx>.

17cdd35

rustc: remove some unnecessary lifetimes in -> TyCtxt methods.

21ac960

Run rustfmt --file-lines ... for changes from previous commits.

fff08cb

eddyb force-pushed the vowel-exclusion-zone branch from 18f8668 to fff08cb Compare June 12, 2019 10:38

oli-obk reviewed Jun 12, 2019

View reviewed changes

rustc_codegen_llvm: deny(unused_lifetimes).

87b6b86

rustc_codegen_llvm: deny(internal).

4c98cb6

oli-obk approved these changes Jun 12, 2019

View reviewed changes

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 Jun 12, 2019

This comment has been minimized.

Sign in to view

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2019

bors merged commit 4c98cb6 into rust-lang:master Jun 12, 2019

bors mentioned this pull request Jun 12, 2019

Refactor interning to properly mark memory as mutable or immutable #58351

Merged

3 tasks

eddyb deleted the vowel-exclusion-zone branch June 12, 2019 16:32

tesuji mentioned this pull request Jun 12, 2019

Fix wrong lifetime of TyCtxt rust-lang/rust-clippy#4200

Merged

bors added a commit to rust-lang/rust-clippy that referenced this pull request Jun 12, 2019

Auto merge of #4200 - lzutao:tyctxt-lifetime, r=phansch

c480344

Fix wrong lifetime of TyCtxt Rustup rust-lang/rust#61722 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request Jun 12, 2019

Auto merge of #4200 - lzutao:tyctxt-lifetime, r=phansch

496841f

Fix wrong lifetime of TyCtxt Rustup rust-lang/rust#61722 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request Jun 12, 2019

Auto merge of #4200 - lzutao:tyctxt-lifetime, r=matthiaskrgr

0814207

Fix wrong lifetime of TyCtxt Rustup rust-lang/rust#61722 changelog: none

RalfJung mentioned this pull request Jun 13, 2019

update miri #61743

Merged

eddyb mentioned this pull request Jun 13, 2019

Unify all uses of 'gcx and 'tcx. #61817

Merged

nikomatsakis mentioned this pull request Jun 14, 2019

Transition the compiler arenas #61838

Closed

4 tasks

eddyb mentioned this pull request Jun 14, 2019

Update for TyCtxt<'a, 'gcx, 'tcx> -> TyCtxt<'tcx>. rust-lang/rustc-dev-guide#340

Merged

RalfJung mentioned this pull request Jun 29, 2019

Spurious RLS test failures #62225

Closed

Uh oh!

Conversation

eddyb commented Jun 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

oli-obk left a comment

Choose a reason for hiding this comment

Uh oh!

oli-obk Jun 12, 2019

Choose a reason for hiding this comment

Uh oh!

eddyb Jun 12, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

eddyb commented Jun 12, 2019

Uh oh!

eddyb commented Jun 12, 2019

Uh oh!

bors commented Jun 12, 2019

Uh oh!

This comment has been minimized.

bors commented Jun 12, 2019

Uh oh!

bors commented Jun 12, 2019

Uh oh!

rust-highfive commented Jun 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

eddyb commented Jun 10, 2019 •

edited

Loading