From 29945d5db002cc5330b85e17eee2e462ba34a986 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 11 Aug 2015 17:35:22 +0200 Subject: [PATCH] syntax: fix use of "vector" for [x; n] literal and [x, y] patterns --- src/libsyntax/ast.rs | 2 +- src/libsyntax/parse/parser.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 307403fda9ac..bcc90dc47d9d 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -941,7 +941,7 @@ pub enum Expr_ { /// `Foo {x: 1, .. base}`, where `base` is the `Option`. ExprStruct(Path, Vec, Option>), - /// A vector literal constructed from one repeated element. + /// An array literal constructed from one repeated element. /// /// For example, `[1u8; 5]`. The first expression is the element /// to be repeated; the second is the number of times to repeat it. diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 770425477426..e6242690ac0d 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2075,7 +2075,7 @@ impl<'a> Parser<'a> { // Nonempty vector. let first_expr = try!(self.parse_expr_nopanic()); if self.check(&token::Semi) { - // Repeating vector syntax: [ 0; 512 ] + // Repeating array syntax: [ 0; 512 ] try!(self.bump()); let count = try!(self.parse_expr_nopanic()); try!(self.expect(&token::CloseDelim(token::Bracket))); @@ -3260,7 +3260,7 @@ impl<'a> Parser<'a> { pat = PatTup(fields); } token::OpenDelim(token::Bracket) => { - // Parse [pat,pat,...] as vector pattern + // Parse [pat,pat,...] as slice pattern try!(self.bump()); let (before, slice, after) = try!(self.parse_pat_vec_elements()); try!(self.expect(&token::CloseDelim(token::Bracket)));