bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #36599 - jonas-schievink:whats-a-pirates-favorite-data-structure, r=pnkfelix

Browse source 
Contains a syntax-[breaking-change] as a separate commit (cc #31645).nnAlso renames slice patterns from `PatKind::Vec` to `PatKind::Slice`.
This commit is contained in:
Manish Goregaokar 2016-09-30 17:43:22 +05:30
commit 259d1fcd47
42 changed files with 121 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1386,8 +1386,8 @@ impl<'a> Parser<'a> {
// Parse the `; e` in `[ i32; e ]`
// where `e` is a const expression
let t = match self.maybe_parse_fixed_length_of_vec()? {
None => TyKind::Vec(t),
Some(suffix) => TyKind::FixedLengthVec(t, suffix)
None => TyKind::Slice(t),
Some(suffix) => TyKind::Array(t, suffix)
};
self.expect(&token::CloseDelim(token::Bracket))?;
t
@ -3587,7 +3587,7 @@ impl<'a> Parser<'a> {
self.bump();
let (before, slice, after) = self.parse_pat_vec_elements()?;
self.expect(&token::CloseDelim(token::Bracket))?;
pat = PatKind::Vec(before, slice, after);
pat = PatKind::Slice(before, slice, after);
}
// At this point, token != _, &, &&, (, [
_ => if self.eat_keyword(keywords::Mut) {