From 3ffe01f40a54812305781911a06ebaa9e55ccd66 Mon Sep 17 00:00:00 2001 From: Michael Zapata Date: Thu, 17 Aug 2017 16:14:32 +1200 Subject: [PATCH] refactor(mir): remove unused argument Small cleanup that shouldn't have any impact --- src/librustc_mir/build/scope.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/librustc_mir/build/scope.rs b/src/librustc_mir/build/scope.rs index d22969d5a1b2a..c36da9410f34a 100644 --- a/src/librustc_mir/build/scope.rs +++ b/src/librustc_mir/build/scope.rs @@ -89,7 +89,7 @@ should go to. use build::{BlockAnd, BlockAndExtension, Builder, CFG}; use rustc::middle::region::CodeExtent; -use rustc::ty::{Ty, TyCtxt}; +use rustc::ty::Ty; use rustc::mir::*; use rustc::mir::transform::MirSource; use syntax_pos::{Span}; @@ -572,7 +572,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> { } assert!(!self.scopes.is_empty()); // or `any` above would be false - let Builder { ref mut hir, ref mut cfg, ref mut scopes, + let Builder { ref mut cfg, ref mut scopes, ref mut cached_resume_block, .. } = *self; // Build up the drops in **reverse** order. The end result will @@ -599,8 +599,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> { }; for scope in scopes.iter_mut() { - target = build_diverge_scope( - hir.tcx(), cfg, scope.extent_span, scope, target); + target = build_diverge_scope(cfg, scope.extent_span, scope, target); } Some(target) } @@ -726,8 +725,7 @@ fn build_scope_drops<'tcx>(cfg: &mut CFG<'tcx>, block.unit() } -fn build_diverge_scope<'a, 'gcx, 'tcx>(_tcx: TyCtxt<'a, 'gcx, 'tcx>, - cfg: &mut CFG<'tcx>, +fn build_diverge_scope<'a, 'gcx, 'tcx>(cfg: &mut CFG<'tcx>, span: Span, scope: &mut Scope<'tcx>, mut target: BasicBlock)