bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #97292 - compiler-errors:tcxify-rustc, r=davidtwco

Browse source 
Lifetime variance fixes for rustc

#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.
This commit is contained in:
Dylan DPC 2022-05-23 15:11:04 +02:00 • committed by GitHub
commit f4bf64c3f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 92 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_mir_dataflow/src/framework/direction.rs
View file

@ -304,8 +304,8 @@ impl Direction for Backward {
}
}
struct BackwardSwitchIntEdgeEffectsApplier<'a, D, F> {
body: &'a mir::Body<'a>,
struct BackwardSwitchIntEdgeEffectsApplier<'a, 'tcx, D, F> {
body: &'a mir::Body<'tcx>,
pred: BasicBlock,
exit_state: &'a mut D,
bb: BasicBlock,
@ -314,7 +314,7 @@ struct BackwardSwitchIntEdgeEffectsApplier<'a, D, F> {
effects_applied: bool,
}
impl<D, F> super::SwitchIntEdgeEffects<D> for BackwardSwitchIntEdgeEffectsApplier<'_, D, F>
impl<D, F> super::SwitchIntEdgeEffects<D> for BackwardSwitchIntEdgeEffectsApplier<'_, '_, D, F>
where
D: Clone,
F: FnMut(BasicBlock, &D),

2
compiler/rustc_mir_dataflow/src/framework/tests.rs
View file

@ -14,7 +14,7 @@ use super::*;
///
/// This is the `Body` that will be used by the `MockAnalysis` below. The shape of its CFG is not
/// important.
fn mock_body() -> mir::Body<'static> {
fn mock_body<'tcx>() -> mir::Body<'tcx> {
let source_info = mir::SourceInfo::outermost(DUMMY_SP);
let mut blocks = IndexVec::new();