diff options
| author | bors <bors@rust-lang.org> | 2019-06-12 13:41:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-12 13:41:43 +0000 |
| commit | 24ddd1615419be89828fb5628e3c14af86c08b01 (patch) | |
| tree | 0af40c207a95f4e5371fb9812e3992af86fdb5ef /src/test/ui/thinlto | |
| parent | 3d7a1c9dc81b0da3140fe008a2276d6f2c266f10 (diff) | |
| parent | 4c98cb6f7586d92be37c94c6063fa9645a448e92 (diff) | |
| download | rust-24ddd1615419be89828fb5628e3c14af86c08b01.tar.gz rust-24ddd1615419be89828fb5628e3c14af86c08b01.zip | |
Auto merge of #61722 - eddyb:vowel-exclusion-zone, r=oli-obk
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 https://github.com/rust-lang/rustfmt/issues/1324#issuecomment-482109952, 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
Diffstat (limited to 'src/test/ui/thinlto')
0 files changed, 0 insertions, 0 deletions
