From 1dd5ffa4052720d15f38ec283a2da9e5bb5934cb Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Mon, 7 Sep 2015 14:10:25 -0400 Subject: [PATCH] Rename `node_id` to `var_id` and limit to the cases that are actually used --- src/librustc/middle/astencode.rs | 2 +- src/librustc/middle/def.rs | 17 +++++++---------- src/librustc/middle/expr_use_visitor.rs | 4 ++-- src/librustc/util/ppaux.rs | 2 +- src/librustc_mir/tcx/expr.rs | 2 +- src/librustc_trans/trans/closure.rs | 6 +++--- src/librustc_typeck/check/upvar.rs | 4 ++-- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs index a06a6b2509af..6125b7897723 100644 --- a/src/librustc/middle/astencode.rs +++ b/src/librustc/middle/astencode.rs @@ -934,7 +934,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext, rbml_w.tag(c::tag_table_upvar_capture_map, |rbml_w| { rbml_w.id(id); - let var_id = freevar.def.node_id(); + let var_id = freevar.def.var_id(); let upvar_id = ty::UpvarId { var_id: var_id, closure_expr_id: id diff --git a/src/librustc/middle/def.rs b/src/librustc/middle/def.rs index 58d747002c92..ee1319a325e4 100644 --- a/src/librustc/middle/def.rs +++ b/src/librustc/middle/def.rs @@ -114,21 +114,18 @@ pub struct Export { } impl Def { - pub fn node_id(&self) -> ast::NodeId { + pub fn var_id(&self) -> ast::NodeId { match *self { DefLocal(id) | - DefUpvar(id, _, _) | - DefRegion(id) | - DefLabel(id) | - DefSelfTy(_, Some((_, id))) => { + DefUpvar(id, _, _) => { id } - DefFn(_, _) | DefMod(_) | DefForeignMod(_) | DefStatic(_, _) | - DefVariant(_, _, _) | DefTy(_, _) | DefAssociatedTy(_, _) | - DefTyParam(_, _, _, _) | DefUse(_) | DefStruct(_) | DefTrait(_) | - DefMethod(_) | DefConst(_) | DefAssociatedConst(_) | - DefSelfTy(Some(_), None) | DefPrimTy(_) | DefSelfTy(..) => { + DefFn(..) | DefMod(..) | DefForeignMod(..) | DefStatic(..) | + DefVariant(..) | DefTy(..) | DefAssociatedTy(..) | + DefTyParam(..) | DefUse(..) | DefStruct(..) | DefTrait(..) | + DefMethod(..) | DefConst(..) | DefAssociatedConst(..) | + DefPrimTy(..) | DefRegion(..) | DefLabel(..) | DefSelfTy(..) => { panic!("attempted .def_id() on invalid {:?}", self) } } diff --git a/src/librustc/middle/expr_use_visitor.rs b/src/librustc/middle/expr_use_visitor.rs index 86b321a94550..e69b805e8334 100644 --- a/src/librustc/middle/expr_use_visitor.rs +++ b/src/librustc/middle/expr_use_visitor.rs @@ -1160,7 +1160,7 @@ impl<'d,'t,'a,'tcx> ExprUseVisitor<'d,'t,'a,'tcx> { self.tcx().with_freevars(closure_expr.id, |freevars| { for freevar in freevars { - let id_var = freevar.def.node_id(); + let id_var = freevar.def.var_id(); let upvar_id = ty::UpvarId { var_id: id_var, closure_expr_id: closure_expr.id }; let upvar_capture = self.typer.upvar_capture(upvar_id).unwrap(); @@ -1192,7 +1192,7 @@ impl<'d,'t,'a,'tcx> ExprUseVisitor<'d,'t,'a,'tcx> { -> mc::McResult> { // Create the cmt for the variable being borrowed, from the // caller's perspective - let var_id = upvar_def.node_id(); + let var_id = upvar_def.var_id(); let var_ty = try!(self.typer.node_ty(var_id)); self.mc.cat_def(closure_id, closure_span, var_ty, upvar_def) } diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 75099ca24bc7..e4eba8aefcc4 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -896,7 +896,7 @@ impl<'tcx> fmt::Display for ty::TypeVariants<'tcx> { let mut sep = " "; try!(tcx.with_freevars(node_id, |freevars| { for (freevar, upvar_ty) in freevars.iter().zip(&substs.upvar_tys) { - let node_id = freevar.def.node_id(); + let node_id = freevar.def.var_id(); try!(write!(f, "{}{}:{}", sep, diff --git a/src/librustc_mir/tcx/expr.rs b/src/librustc_mir/tcx/expr.rs index baa3346f8319..8cfcf1dd565c 100644 --- a/src/librustc_mir/tcx/expr.rs +++ b/src/librustc_mir/tcx/expr.rs @@ -817,7 +817,7 @@ fn capture_freevar<'a,'tcx:'a>(cx: &mut Cx<'a,'tcx>, freevar: &ty::Freevar, freevar_ty: Ty<'tcx>) -> ExprRef> { - let id_var = freevar.def.node_id(); + let id_var = freevar.def.var_id(); let upvar_id = ty::UpvarId { var_id: id_var, closure_expr_id: closure_expr.id }; let upvar_capture = cx.tcx.upvar_capture(upvar_id).unwrap(); let temp_lifetime = cx.tcx.region_maps.temporary_scope(closure_expr.id); diff --git a/src/librustc_trans/trans/closure.rs b/src/librustc_trans/trans/closure.rs index 48fbbfffef65..89724c38cb2c 100644 --- a/src/librustc_trans/trans/closure.rs +++ b/src/librustc_trans/trans/closure.rs @@ -68,7 +68,7 @@ fn load_closure_environment<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, }; for (i, freevar) in freevars.iter().enumerate() { - let upvar_id = ty::UpvarId { var_id: freevar.def.node_id(), + let upvar_id = ty::UpvarId { var_id: freevar.def.var_id(), closure_expr_id: bcx.fcx.id }; let upvar_capture = bcx.tcx().upvar_capture(upvar_id).unwrap(); let mut upvar_ptr = StructGEP(bcx, llenv, i); @@ -79,7 +79,7 @@ fn load_closure_environment<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, true } }; - let node_id = freevar.def.node_id(); + let node_id = freevar.def.var_id(); bcx.fcx.llupvars.borrow_mut().insert(node_id, upvar_ptr); if kind == ty::FnOnceClosureKind && !captured_by_ref { @@ -236,7 +236,7 @@ pub fn trans_closure_expr<'a, 'tcx>(dest: Dest<'a, 'tcx>, for (i, freevar) in freevars.iter().enumerate() { let datum = expr::trans_local_var(bcx, freevar.def); let upvar_slot_dest = adt::trans_field_ptr(bcx, &*repr, dest_addr, 0, i); - let upvar_id = ty::UpvarId { var_id: freevar.def.node_id(), + let upvar_id = ty::UpvarId { var_id: freevar.def.var_id(), closure_expr_id: id }; match tcx.upvar_capture(upvar_id).unwrap() { ty::UpvarCapture::ByValue => { diff --git a/src/librustc_typeck/check/upvar.rs b/src/librustc_typeck/check/upvar.rs index 0024b51ae0f9..8086c49c769a 100644 --- a/src/librustc_typeck/check/upvar.rs +++ b/src/librustc_typeck/check/upvar.rs @@ -126,7 +126,7 @@ impl<'a,'tcx> SeedBorrowKind<'a,'tcx> { self.tcx().with_freevars(expr.id, |freevars| { for freevar in freevars { - let var_node_id = freevar.def.node_id(); + let var_node_id = freevar.def.var_id(); let upvar_id = ty::UpvarId { var_id: var_node_id, closure_expr_id: expr.id }; debug!("seed upvar_id {:?}", upvar_id); @@ -235,7 +235,7 @@ impl<'a,'tcx> AdjustBorrowKind<'a,'tcx> { tcx.with_freevars(closure_id, |freevars| { freevars.iter() .map(|freevar| { - let freevar_node_id = freevar.def.node_id(); + let freevar_node_id = freevar.def.var_id(); let freevar_ty = self.fcx.node_ty(freevar_node_id); let upvar_id = ty::UpvarId { var_id: freevar_node_id,