diff --git a/src/librustc_typeck/check/closure.rs b/src/librustc_typeck/check/closure.rs index a1756dd6334..7671ad36971 100644 --- a/src/librustc_typeck/check/closure.rs +++ b/src/librustc_typeck/check/closure.rs @@ -13,20 +13,18 @@ use super::{check_fn, Expectation, FnCtxt}; use astconv; -use middle::infer; use middle::region::CodeExtent; use middle::subst; use middle::ty::{self, ToPolyTraitRef, Ty}; use rscope::RegionScope; use syntax::abi; use syntax::ast; -use syntax::ast::CaptureClause::*; use syntax::ast_util; use util::ppaux::Repr; pub fn check_expr_closure<'a,'tcx>(fcx: &FnCtxt<'a,'tcx>, expr: &ast::Expr, - capture: ast::CaptureClause, + _capture: ast::CaptureClause, opt_kind: Option, decl: &ast::FnDecl, body: &ast::Block, diff --git a/src/librustc_typeck/check/regionck.rs b/src/librustc_typeck/check/regionck.rs index 2adbd1f0a3f..5a826326380 100644 --- a/src/librustc_typeck/check/regionck.rs +++ b/src/librustc_typeck/check/regionck.rs @@ -856,10 +856,8 @@ fn check_expr_fn_block(rcx: &mut Rcx, fn constrain_callee(rcx: &mut Rcx, callee_id: ast::NodeId, - call_expr: &ast::Expr, - callee_expr: &ast::Expr) { - let call_region = ty::ReScope(CodeExtent::from_node_id(call_expr.id)); - + _call_expr: &ast::Expr, + _callee_expr: &ast::Expr) { let callee_ty = rcx.resolve_node_type(callee_id); match callee_ty.sty { ty::ty_bare_fn(..) => { } diff --git a/src/librustc_typeck/check/regionmanip.rs b/src/librustc_typeck/check/regionmanip.rs index e73fa195b04..7a9961e750c 100644 --- a/src/librustc_typeck/check/regionmanip.rs +++ b/src/librustc_typeck/check/regionmanip.rs @@ -319,22 +319,6 @@ impl<'a, 'tcx> Wf<'a, 'tcx> { } } - fn accumulate_from_closure_ty(&mut self, - ty: Ty<'tcx>, - c: &ty::ClosureTy<'tcx>) - { - match c.store { - ty::RegionTraitStore(r_b, _) => { - self.push_region_constraint_from_top(r_b); - } - ty::UniqTraitStore => { } - } - - let required_region_bounds = - ty::object_region_bounds(self.tcx, None, c.bounds.builtin_bounds); - self.accumulate_from_object_ty(ty, c.bounds.region_bound, required_region_bounds); - } - fn accumulate_from_object_ty(&mut self, ty: Ty<'tcx>, region_bound: ty::Region,