bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: replace Vec::push_all with stable Vec::extend

Browse source
This commit is contained in:
Erick Tryzelaar 2015-04-16 21:57:38 -07:00
parent 21143aae94
commit c3da1a1912
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -436,10 +436,11 @@ impl<'a> Parser<'a> {
// leave it in the input // leave it in the input
Ok(()) Ok(())
} else { } else {
let mut expected = edible.iter().map(|x| TokenType::Token(x.clone())) let mut expected = edible.iter()
.collect::<Vec<_>>(); .map(|x| TokenType::Token(x.clone()))
expected.extend(inedible.iter().map(|x| TokenType::Token(x.clone()))); .chain(inedible.iter().map(|x| TokenType::Token(x.clone())))
expected.push_all(&*self.expected_tokens); .chain(self.expected_tokens.iter().cloned())
.collect::<Vec<_>>();
expected.sort_by(|a, b| a.to_string().cmp(&b.to_string())); expected.sort_by(|a, b| a.to_string().cmp(&b.to_string()));
expected.dedup(); expected.dedup();
let expect = tokens_to_string(&expected[..]); let expect = tokens_to_string(&expected[..]);
@ -490,8 +491,10 @@ impl<'a> Parser<'a> {
debug!("commit_expr {:?}", e); debug!("commit_expr {:?}", e);
if let ExprPath(..) = e.node { if let ExprPath(..) = e.node {
// might be unit-struct construction; check for recoverableinput error. // might be unit-struct construction; check for recoverableinput error.
let mut expected = edible.iter().cloned().collect::<Vec<_>>(); let expected = edible.iter()
expected.push_all(inedible); .cloned()
.chain(inedible.iter().cloned())
.collect::<Vec<_>>();
try!(self.check_for_erroneous_unit_struct_expecting(&expected[..])); try!(self.check_for_erroneous_unit_struct_expecting(&expected[..]));
} }
self.expect_one_of(edible, inedible) self.expect_one_of(edible, inedible)
@ -509,8 +512,10 @@ impl<'a> Parser<'a> {
if self.last_token if self.last_token
.as_ref() .as_ref()
.map_or(false, |t| t.is_ident() || t.is_path()) { .map_or(false, |t| t.is_ident() || t.is_path()) {
let mut expected = edible.iter().cloned().collect::<Vec<_>>(); let expected = edible.iter()
expected.push_all(&inedible); .cloned()
.chain(inedible.iter().cloned())
.collect::<Vec<_>>();
try!(self.check_for_erroneous_unit_struct_expecting(&expected)); try!(self.check_for_erroneous_unit_struct_expecting(&expected));
} }
self.expect_one_of(edible, inedible) self.expect_one_of(edible, inedible)
@ -1187,7 +1192,7 @@ impl<'a> Parser<'a> {
debug!("parse_trait_methods(): parsing provided method"); debug!("parse_trait_methods(): parsing provided method");
let (inner_attrs, body) = let (inner_attrs, body) =
try!(p.parse_inner_attrs_and_block()); try!(p.parse_inner_attrs_and_block());
attrs.push_all(&inner_attrs[..]); attrs.extend(inner_attrs.iter().cloned());
Some(body) Some(body)
} }