@@ -89,7 +89,7 @@ should go to.
89
89
90
90
use build:: { BlockAnd , BlockAndExtension , Builder , CFG } ;
91
91
use rustc:: middle:: region:: CodeExtent ;
92
- use rustc:: ty:: { Ty , TyCtxt } ;
92
+ use rustc:: ty:: Ty ;
93
93
use rustc:: mir:: * ;
94
94
use rustc:: mir:: transform:: MirSource ;
95
95
use syntax_pos:: { Span } ;
@@ -572,7 +572,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
572
572
}
573
573
assert ! ( !self . scopes. is_empty( ) ) ; // or `any` above would be false
574
574
575
- let Builder { ref mut hir , ref mut cfg, ref mut scopes,
575
+ let Builder { ref mut cfg, ref mut scopes,
576
576
ref mut cached_resume_block, .. } = * self ;
577
577
578
578
// Build up the drops in **reverse** order. The end result will
@@ -599,8 +599,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
599
599
} ;
600
600
601
601
for scope in scopes. iter_mut ( ) {
602
- target = build_diverge_scope (
603
- hir. tcx ( ) , cfg, scope. extent_span , scope, target) ;
602
+ target = build_diverge_scope ( cfg, scope. extent_span , scope, target) ;
604
603
}
605
604
Some ( target)
606
605
}
@@ -726,8 +725,7 @@ fn build_scope_drops<'tcx>(cfg: &mut CFG<'tcx>,
726
725
block. unit ( )
727
726
}
728
727
729
- fn build_diverge_scope < ' a , ' gcx , ' tcx > ( _tcx : TyCtxt < ' a , ' gcx , ' tcx > ,
730
- cfg : & mut CFG < ' tcx > ,
728
+ fn build_diverge_scope < ' a , ' gcx , ' tcx > ( cfg : & mut CFG < ' tcx > ,
731
729
span : Span ,
732
730
scope : & mut Scope < ' tcx > ,
733
731
mut target : BasicBlock )
0 commit comments