rustc: replace Res in hir::Upvar with only Local/Upvar data.

[rust.git] / src / librustc_typeck / check / upvar.rs

diff --git a/src/librustc_typeck/check/upvar.rs b/src/librustc_typeck/check/upvar.rs
index c3861f964e4534dfe39e7363ea07a2ec73ed0463..a4f9ede37c9dbeed22beaf3db2588cf16a08fc82 100644 (file)
--- a/src/librustc_typeck/check/upvar.rs
+++ b/src/librustc_typeck/check/upvar.rs
@@ -126,7 +126,7 @@ fn analyze_closure(
             for upvar in upvars.iter() {
                 let upvar_id = ty::UpvarId {
                     var_path: ty::UpvarPath {
-                        hir_id: upvar.var_id(),
+                        hir_id: upvar.var_id,
                     },
                     closure_expr_id: LocalDefId::from_def_id(closure_def_id),
                 };
@@ -250,17 +250,16 @@ fn final_upvar_tys(&self, closure_id: hir::HirId) -> Vec<Ty<'tcx>> {
             upvars
                 .iter()
                 .map(|upvar| {
-                    let var_hir_id = upvar.var_id();
-                    let upvar_ty = self.node_ty(var_hir_id);
+                    let upvar_ty = self.node_ty(upvar.var_id);
                     let upvar_id = ty::UpvarId {
-                        var_path: ty::UpvarPath { hir_id: var_hir_id },
+                        var_path: ty::UpvarPath { hir_id: upvar.var_id },
                         closure_expr_id: LocalDefId::from_def_id(closure_def_id),
                     };
                     let capture = self.tables.borrow().upvar_capture(upvar_id);
 
                     debug!(
                         "var_id={:?} upvar_ty={:?} capture={:?}",
-                        var_hir_id, upvar_ty, capture
+                        upvar.var_id, upvar_ty, capture
                     );
 
                     match capture {