@@ -228,11 +228,13 @@ impl<'tcx> RegionInferenceContext<'tcx> {
228228 ) -> Option < RegionName > {
229229 let error_region = self . to_error_region ( fr) ?;
230230
231+ let tcx = mbcx. infcx . tcx ;
232+
231233 debug ! ( "give_region_a_name: error_region = {:?}" , error_region) ;
232234 match error_region {
233235 ty:: ReEarlyBound ( ebr) => {
234236 if ebr. has_name ( ) {
235- let span = mbcx . infcx . tcx . hir ( ) . span_if_local ( ebr. def_id ) . unwrap_or ( DUMMY_SP ) ;
237+ let span = tcx. hir ( ) . span_if_local ( ebr. def_id ) . unwrap_or ( DUMMY_SP ) ;
236238 Some ( RegionName {
237239 name : ebr. name ,
238240 source : RegionNameSource :: NamedEarlyBoundRegion ( span) ,
@@ -249,8 +251,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
249251 ty:: ReFree ( free_region) => match free_region. bound_region {
250252 ty:: BoundRegion :: BrNamed ( region_def_id, name) => {
251253 // Get the span to point to, even if we don't use the name.
252- let span =
253- mbcx. infcx . tcx . hir ( ) . span_if_local ( region_def_id) . unwrap_or ( DUMMY_SP ) ;
254+ let span = tcx. hir ( ) . span_if_local ( region_def_id) . unwrap_or ( DUMMY_SP ) ;
254255 debug ! (
255256 "bound region named: {:?}, is_named: {:?}" ,
256257 name,
@@ -285,15 +286,15 @@ impl<'tcx> RegionInferenceContext<'tcx> {
285286
286287 if let DefiningTy :: Closure ( def_id, substs) = def_ty {
287288 let args_span = if let hir:: ExprKind :: Closure ( _, _, _, span, _) =
288- mbcx . infcx . tcx . hir ( ) . expect_expr ( mir_hir_id) . kind
289+ tcx. hir ( ) . expect_expr ( mir_hir_id) . kind
289290 {
290291 span
291292 } else {
292293 bug ! ( "Closure is not defined by a closure expr" ) ;
293294 } ;
294295 let region_name = renctx. synthesize_region_name ( ) ;
295296
296- let closure_kind_ty = substs. as_closure ( ) . kind_ty ( def_id, mbcx . infcx . tcx ) ;
297+ let closure_kind_ty = substs. as_closure ( ) . kind_ty ( def_id, tcx) ;
297298 let note = match closure_kind_ty. to_opt_closure_kind ( ) {
298299 Some ( ty:: ClosureKind :: Fn ) => {
299300 "closure implements `Fn`, so references to captured variables \
0 commit comments