@@ -872,26 +872,26 @@ fn compute_storage_conflicts<'mir, 'tcx>(
872
872
storage_conflicts
873
873
}
874
874
875
- struct StorageConflictVisitor < ' mir , ' tcx , ' s > {
876
- body : & ' mir Body < ' tcx > ,
877
- saved_locals : & ' s CoroutineSavedLocals ,
875
+ struct StorageConflictVisitor < ' a , ' tcx > {
876
+ body : & ' a Body < ' tcx > ,
877
+ saved_locals : & ' a CoroutineSavedLocals ,
878
878
// FIXME(tmandry): Consider using sparse bitsets here once we have good
879
879
// benchmarks for coroutines.
880
880
local_conflicts : BitMatrix < Local , Local > ,
881
881
// We keep this bitset as a buffer to avoid reallocating memory.
882
882
eligible_storage_live : BitSet < Local > ,
883
883
}
884
884
885
- impl < ' mir , ' tcx , R > rustc_mir_dataflow:: ResultsVisitor < ' mir , ' tcx , R >
886
- for StorageConflictVisitor < ' mir , ' tcx , ' _ >
885
+ impl < ' a , ' tcx , R > rustc_mir_dataflow:: ResultsVisitor < ' a , ' tcx , R >
886
+ for StorageConflictVisitor < ' a , ' tcx >
887
887
{
888
888
type FlowState = BitSet < Local > ;
889
889
890
890
fn visit_statement_before_primary_effect (
891
891
& mut self ,
892
892
_results : & mut R ,
893
893
state : & Self :: FlowState ,
894
- _statement : & ' mir Statement < ' tcx > ,
894
+ _statement : & ' a Statement < ' tcx > ,
895
895
loc : Location ,
896
896
) {
897
897
self . apply_state ( state, loc) ;
@@ -901,14 +901,14 @@ impl<'mir, 'tcx, R> rustc_mir_dataflow::ResultsVisitor<'mir, 'tcx, R>
901
901
& mut self ,
902
902
_results : & mut R ,
903
903
state : & Self :: FlowState ,
904
- _terminator : & ' mir Terminator < ' tcx > ,
904
+ _terminator : & ' a Terminator < ' tcx > ,
905
905
loc : Location ,
906
906
) {
907
907
self . apply_state ( state, loc) ;
908
908
}
909
909
}
910
910
911
- impl StorageConflictVisitor < ' _ , ' _ , ' _ > {
911
+ impl StorageConflictVisitor < ' _ , ' _ > {
912
912
fn apply_state ( & mut self , flow_state : & BitSet < Local > , loc : Location ) {
913
913
// Ignore unreachable blocks.
914
914
if let TerminatorKind :: Unreachable = self . body . basic_blocks [ loc. block ] . terminator ( ) . kind {
0 commit comments