diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-01 20:35:55 -0800 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-01 20:35:55 -0800 |
| commit | aa3505d8ff043f0c1da62de4f517eed6defb6187 (patch) | |
| tree | d0f82e2e5dd7b3dfeeb8b593ed0d76393e41ff05 /src/libsyntax/parse/parser.rs | |
| parent | 85fecd0ba77066e604cec9d3866b76edc626b5d3 (diff) | |
| parent | 0fd1b58f236b4fe653d164836e94feebb2972931 (diff) | |
| download | rust-aa3505d8ff043f0c1da62de4f517eed6defb6187.tar.gz rust-aa3505d8ff043f0c1da62de4f517eed6defb6187.zip | |
Merge remote-tracking branch 'remotes/origin/incoming' into incoming
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b0b2107703c..127af5b73ac 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1195,7 +1195,7 @@ pub impl Parser { &token::RBRACKET, seq_sep_trailing_allowed(token::COMMA), |p| p.parse_expr() - ).to_vec(); + ); ex = expr_vec(~[first_expr] + remaining_exprs, mutbl); } else { // Vector with one element. @@ -1478,7 +1478,7 @@ pub impl Parser { &ket, seq_sep_none(), |p| p.parse_token_tree() - ).to_vec(), + ), // the close delimiter: ~[parse_any_tt_tok(&self)] ) @@ -2806,7 +2806,7 @@ pub impl Parser { let result = self.parse_seq_to_gt( Some(token::COMMA), |p| p.parse_ty(false)); - result.to_vec() + opt_vec::take_vec(result) } fn parse_fn_decl(parse_arg_fn: fn(&Parser) -> arg_or_capture_item) @@ -2908,7 +2908,7 @@ pub impl Parser { &token::RPAREN, sep, parse_arg_fn - ).to_vec(); + ); } token::RPAREN => { args_or_capture_items = ~[]; @@ -2928,7 +2928,7 @@ pub impl Parser { &token::RPAREN, sep, parse_arg_fn - ).to_vec(); + ); } self.expect(&token::RPAREN); @@ -3130,7 +3130,7 @@ pub impl Parser { ket, seq_sep_none(), |p| p.parse_trait_ref() - ).to_vec() + ) } fn parse_item_struct() -> item_info { |