diff options
| author | Michael Goulet <michael@errs.io> | 2022-05-22 12:48:19 -0700 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2022-05-22 14:29:32 -0700 |
| commit | 1784634a39be33b71b9118f8900fd0377e2c75c0 (patch) | |
| tree | b26f0d981d31934ad56b043af5065b2ca068fad9 /compiler/rustc_mir_dataflow/src/framework | |
| parent | 4bb4dc4672b4d80509db4c0572ae8ceeaf7d4a1c (diff) | |
| download | rust-1784634a39be33b71b9118f8900fd0377e2c75c0.tar.gz rust-1784634a39be33b71b9118f8900fd0377e2c75c0.zip | |
Lifetime variance fixes for rustc
Diffstat (limited to 'compiler/rustc_mir_dataflow/src/framework')
| -rw-r--r-- | compiler/rustc_mir_dataflow/src/framework/direction.rs | 6 | ||||
| -rw-r--r-- | compiler/rustc_mir_dataflow/src/framework/tests.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_mir_dataflow/src/framework/direction.rs b/compiler/rustc_mir_dataflow/src/framework/direction.rs index 18795128b85..d6bfde8f34c 100644 --- a/compiler/rustc_mir_dataflow/src/framework/direction.rs +++ b/compiler/rustc_mir_dataflow/src/framework/direction.rs @@ -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), diff --git a/compiler/rustc_mir_dataflow/src/framework/tests.rs b/compiler/rustc_mir_dataflow/src/framework/tests.rs index 3cc8d30259c..708a142581a 100644 --- a/compiler/rustc_mir_dataflow/src/framework/tests.rs +++ b/compiler/rustc_mir_dataflow/src/framework/tests.rs @@ -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(); |
