diff options
| author | Ben Striegel <ben.striegel@gmail.com> | 2012-10-10 00:28:04 -0400 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-10-20 17:50:46 -0700 |
| commit | ac81fff22926d464f7a90f14c4c8f846569e75e0 (patch) | |
| tree | cc94e2558cdea7c88c56c4125b56556e1dc40419 /src/libsyntax | |
| parent | 4174688dd48f4967e08c0aecc7a2a90dc28a56da (diff) | |
| download | rust-ac81fff22926d464f7a90f14c4c8f846569e75e0.tar.gz rust-ac81fff22926d464f7a90f14c4c8f846569e75e0.zip | |
Remove old fixed-length vector syntax
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index f494d564816..010c604dd1a 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -462,7 +462,7 @@ impl proto : cmp::Eq { #[auto_deserialize] enum vstore { // FIXME (#3469): Change uint to @expr (actually only constant exprs) - vstore_fixed(Option<uint>), // [1,2,3,4]/_ or 4 + vstore_fixed(Option<uint>), // [1,2,3,4] vstore_uniq, // ~[1,2,3,4] vstore_box, // @[1,2,3,4] vstore_slice(@region) // &[1,2,3,4](foo)? @@ -472,7 +472,8 @@ enum vstore { #[auto_deserialize] enum expr_vstore { // FIXME (#3469): Change uint to @expr (actually only constant exprs) - expr_vstore_fixed(Option<uint>), // [1,2,3,4]/_ or 4 + expr_vstore_fixed(Option<uint>), // [1,2,3,4] +>>>>>>> Remove old fixed-length vector syntax expr_vstore_uniq, // ~[1,2,3,4] expr_vstore_box, // @[1,2,3,4] expr_vstore_slice // &[1,2,3,4] diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8636c51b369..46905b8fe01 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -207,12 +207,7 @@ fn Parser(sess: parse_sess, cfg: ast::crate_cfg, token: tok0.tok, span: span0, last_span: span0, - buffer: [mut - {tok: tok0.tok, sp: span0}, - {tok: tok0.tok, sp: span0}, - {tok: tok0.tok, sp: span0}, - {tok: tok0.tok, sp: span0} - ]/4, + buffer: [mut {tok: tok0.tok, sp: span0}, ..4], buffer_start: 0, buffer_end: 0, restriction: UNRESTRICTED, @@ -231,7 +226,7 @@ struct Parser { mut token: token::Token, mut span: span, mut last_span: span, - mut buffer: [mut {tok: token::Token, sp: span}]/4, + mut buffer: [mut {tok: token::Token, sp: span} * 4], mut buffer_start: int, mut buffer_end: int, mut restriction: restriction, |