From a9f8f98caabbe388b576f1c277cff51253db6b44 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Sun, 15 Jan 2017 23:36:10 -0800 Subject: [PATCH] Rename ExprKind::Vec to Array in HIR and HAIR. This is a clearer name since they represent [a, b, c] array literals. --- src/librustc/hir/lowering.rs | 2 +- src/librustc_mir/build/expr/as_lvalue.rs | 2 +- src/librustc_mir/build/expr/as_rvalue.rs | 2 +- src/librustc_mir/build/expr/category.rs | 2 +- src/librustc_mir/build/expr/into.rs | 2 +- src/librustc_mir/hair/cx/expr.rs | 2 +- src/librustc_mir/hair/mod.rs | 2 +- src/libsyntax/ast.rs | 2 +- src/libsyntax/ext/build.rs | 2 +- src/libsyntax/fold.rs | 4 ++-- src/libsyntax/parse/parser.rs | 6 +++--- src/libsyntax/print/pprust.rs | 2 +- src/libsyntax/test.rs | 2 +- src/libsyntax/visit.rs | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 9a2658f48f3..3b20a77ad03 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -1382,7 +1382,7 @@ fn lower_expr(&mut self, e: &Expr) -> hir::Expr { return self.expr_block(P(block), e.attrs.clone()); } - ExprKind::Vec(ref exprs) => { + ExprKind::Array(ref exprs) => { hir::ExprArray(exprs.iter().map(|x| self.lower_expr(x)).collect()) } ExprKind::Repeat(ref expr, ref count) => { diff --git a/src/librustc_mir/build/expr/as_lvalue.rs b/src/librustc_mir/build/expr/as_lvalue.rs index 58abaa0c484..0487e277a33 100644 --- a/src/librustc_mir/build/expr/as_lvalue.rs +++ b/src/librustc_mir/build/expr/as_lvalue.rs @@ -87,7 +87,7 @@ fn expr_as_lvalue(&mut self, block.and(Lvalue::Static(id)) } - ExprKind::Vec { .. } | + ExprKind::Array { .. } | ExprKind::Tuple { .. } | ExprKind::Adt { .. } | ExprKind::Closure { .. } | diff --git a/src/librustc_mir/build/expr/as_rvalue.rs b/src/librustc_mir/build/expr/as_rvalue.rs index 8199a08c852..48690a275c2 100644 --- a/src/librustc_mir/build/expr/as_rvalue.rs +++ b/src/librustc_mir/build/expr/as_rvalue.rs @@ -132,7 +132,7 @@ fn expr_as_rvalue(&mut self, let source = unpack!(block = this.as_operand(block, source)); block.and(Rvalue::Cast(CastKind::Unsize, source, expr.ty)) } - ExprKind::Vec { fields } => { + ExprKind::Array { fields } => { // (*) We would (maybe) be closer to trans if we // handled this and other aggregate cases via // `into()`, not `as_rvalue` -- in that case, instead diff --git a/src/librustc_mir/build/expr/category.rs b/src/librustc_mir/build/expr/category.rs index 9671f80f48b..6e57c10964c 100644 --- a/src/librustc_mir/build/expr/category.rs +++ b/src/librustc_mir/build/expr/category.rs @@ -60,7 +60,7 @@ pub fn of<'tcx>(ek: &ExprKind<'tcx>) -> Option { ExprKind::Call { .. } => Some(Category::Rvalue(RvalueFunc::Into)), - ExprKind::Vec { .. } | + ExprKind::Array { .. } | ExprKind::Tuple { .. } | ExprKind::Adt { .. } | ExprKind::Closure { .. } | diff --git a/src/librustc_mir/build/expr/into.rs b/src/librustc_mir/build/expr/into.rs index ffd9525933b..24b9c955658 100644 --- a/src/librustc_mir/build/expr/into.rs +++ b/src/librustc_mir/build/expr/into.rs @@ -256,7 +256,7 @@ pub fn into_expr(&mut self, ExprKind::VarRef { .. } | ExprKind::SelfRef | ExprKind::StaticRef { .. } | - ExprKind::Vec { .. } | + ExprKind::Array { .. } | ExprKind::Tuple { .. } | ExprKind::Adt { .. } | ExprKind::Closure { .. } | diff --git a/src/librustc_mir/hair/cx/expr.rs b/src/librustc_mir/hair/cx/expr.rs index fe10fb57c35..cdf7cae3020 100644 --- a/src/librustc_mir/hair/cx/expr.rs +++ b/src/librustc_mir/hair/cx/expr.rs @@ -664,7 +664,7 @@ fn make_mirror_unadjusted<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>, value_extents: cx.tcx.region_maps.node_extent(value.id), } } - hir::ExprArray(ref fields) => ExprKind::Vec { fields: fields.to_ref() }, + hir::ExprArray(ref fields) => ExprKind::Array { fields: fields.to_ref() }, hir::ExprTup(ref fields) => ExprKind::Tuple { fields: fields.to_ref() }, }; diff --git a/src/librustc_mir/hair/mod.rs b/src/librustc_mir/hair/mod.rs index 22c07f1903b..f57d442752d 100644 --- a/src/librustc_mir/hair/mod.rs +++ b/src/librustc_mir/hair/mod.rs @@ -214,7 +214,7 @@ pub enum ExprKind<'tcx> { value: ExprRef<'tcx>, count: TypedConstVal<'tcx>, }, - Vec { + Array { fields: Vec>, }, Tuple { diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 709de49fbaa..09fce1dbfa1 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -864,7 +864,7 @@ pub enum ExprKind { /// First expr is the place; second expr is the value. InPlace(P, P), /// An array (`[a, b, c, d]`) - Vec(Vec>), + Array(Vec>), /// A function call /// /// The first field resolves to the function itself, diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 688df96ffa3..8c4b56b7fc0 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -745,7 +745,7 @@ fn expr_bool(&self, sp: Span, value: bool) -> P { } fn expr_vec(&self, sp: Span, exprs: Vec>) -> P { - self.expr(sp, ast::ExprKind::Vec(exprs)) + self.expr(sp, ast::ExprKind::Array(exprs)) } fn expr_vec_ng(&self, sp: Span) -> P { self.expr_call_global(sp, self.std_path(&["vec", "Vec", "new"]), diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 10ca9da2112..e230aae08f0 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -1123,8 +1123,8 @@ pub fn noop_fold_expr(Expr {id, node, span, attrs}: Expr, folder: &mu ExprKind::InPlace(p, e) => { ExprKind::InPlace(folder.fold_expr(p), folder.fold_expr(e)) } - ExprKind::Vec(exprs) => { - ExprKind::Vec(folder.fold_exprs(exprs)) + ExprKind::Array(exprs) => { + ExprKind::Array(folder.fold_exprs(exprs)) } ExprKind::Repeat(expr, count) => { ExprKind::Repeat(folder.fold_expr(expr), folder.fold_expr(count)) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 167fa78d7e0..6264b7f3ed3 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2140,7 +2140,7 @@ fn parse_bottom_expr(&mut self) -> PResult<'a, P> { if self.check(&token::CloseDelim(token::Bracket)) { // Empty vector. self.bump(); - ex = ExprKind::Vec(Vec::new()); + ex = ExprKind::Array(Vec::new()); } else { // Nonempty vector. let first_expr = self.parse_expr()?; @@ -2160,11 +2160,11 @@ fn parse_bottom_expr(&mut self) -> PResult<'a, P> { )?; let mut exprs = vec![first_expr]; exprs.extend(remaining_exprs); - ex = ExprKind::Vec(exprs); + ex = ExprKind::Array(exprs); } else { // Vector with one element. self.expect(&token::CloseDelim(token::Bracket))?; - ex = ExprKind::Vec(vec![first_expr]); + ex = ExprKind::Array(vec![first_expr]); } } hi = self.prev_span.hi; diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index ff77732f535..057737d7548 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -2018,7 +2018,7 @@ fn print_expr_outer_attr_style(&mut self, ast::ExprKind::InPlace(ref place, ref expr) => { self.print_expr_in_place(place, expr)?; } - ast::ExprKind::Vec(ref exprs) => { + ast::ExprKind::Array(ref exprs) => { self.print_expr_vec(&exprs[..], attrs)?; } ast::ExprKind::Repeat(ref element, ref count) => { diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs index b8e0b938814..74ec33fdd2a 100644 --- a/src/libsyntax/test.rs +++ b/src/libsyntax/test.rs @@ -628,7 +628,7 @@ fn mk_test_descs(cx: &TestCtxt) -> P { node: ast::ExprKind::AddrOf(ast::Mutability::Immutable, P(ast::Expr { id: ast::DUMMY_NODE_ID, - node: ast::ExprKind::Vec(cx.testfns.iter().map(|test| { + node: ast::ExprKind::Array(cx.testfns.iter().map(|test| { mk_test_desc_and_fn_rec(cx, test) }).collect()), span: DUMMY_SP, diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 04100b3af00..5c719457fa4 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -650,7 +650,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) { visitor.visit_expr(place); visitor.visit_expr(subexpression) } - ExprKind::Vec(ref subexpressions) => { + ExprKind::Array(ref subexpressions) => { walk_list!(visitor, visit_expr, subexpressions); } ExprKind::Repeat(ref element, ref count) => { -- 2.44.0