From 230d0eb0031a9bd9df601ee95b62badd5771d9d0 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Wed, 3 Dec 2014 13:04:49 -0500 Subject: [PATCH] Use the typer in ExprUseVisitor and do not hard code to tcx --- src/librustc/middle/expr_use_visitor.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc/middle/expr_use_visitor.rs b/src/librustc/middle/expr_use_visitor.rs index bf939e983386..a55ef23ddad0 100644 --- a/src/librustc/middle/expr_use_visitor.rs +++ b/src/librustc/middle/expr_use_visitor.rs @@ -1254,7 +1254,7 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,'tcx,TYPER> { // inferred by regionbk let upvar_id = ty::UpvarId { var_id: id_var, closure_expr_id: closure_expr.id }; - let upvar_borrow = self.tcx().upvar_borrow_map.borrow()[upvar_id].clone(); + let upvar_borrow = self.typer.upvar_borrow(upvar_id); self.delegate.borrow(closure_expr.id, closure_expr.span,