diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 22:11:39 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 22:42:20 -0700 |
| commit | 8267ff7ae2af90955058df017a61771e0984b95d (patch) | |
| tree | a1e01158d21c6775ee80a11d80c753051d9b6055 /src/libsyntax | |
| parent | 2abc93606fdb39835e82cefc53e0d75043d79fd3 (diff) | |
| parent | 29945d5db002cc5330b85e17eee2e462ba34a986 (diff) | |
| download | rust-8267ff7ae2af90955058df017a61771e0984b95d.tar.gz rust-8267ff7ae2af90955058df017a61771e0984b95d.zip | |
rollup merge of #27664: birkenfeld/patch-1
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | 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 307403fda9a..bcc90dc47d9 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<Expr>`. ExprStruct(Path, Vec<Field>, Option<P<Expr>>), - /// 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 77042547742..e6242690ac0 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))); |
