user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollup merge of #27664: birkenfeld/patch-1

Browse source
This commit is contained in:
Alex Crichton 2015-08-11 22:11:39 -07:00
commit 8267ff7ae2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/ast.rs
View file

@ -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.

4
src/libsyntax/parse/parser.rs
View file

@ -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)));