diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-26 22:24:32 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-27 07:04:16 -0700 |
| commit | 83e831bc229c2346e2322aaad1fdaa219325a4b3 (patch) | |
| tree | 06c73c7692cb33eef2741e4b3a60b297190fa741 /src/libsyntax | |
| parent | 7a199d41a96cbf31152a2b5f4b3881a51ac7a9ae (diff) | |
| download | rust-83e831bc229c2346e2322aaad1fdaa219325a4b3.tar.gz rust-83e831bc229c2346e2322aaad1fdaa219325a4b3.zip | |
syntax: Remove deprecated expr_vstore_fixed
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/ext/build.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 15 |
4 files changed, 4 insertions, 19 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index f873d6b6bb4..10b98ec3c08 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -386,7 +386,6 @@ pub enum vstore { #[auto_decode] #[deriving(Eq)] pub enum expr_vstore { - expr_vstore_fixed(Option<uint>), // [1,2,3,4] expr_vstore_uniq, // ~[1,2,3,4] expr_vstore_box, // @[1,2,3,4] expr_vstore_mut_box, // @mut [1,2,3,4] diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index ad71441e046..9499f95f0e7 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -152,11 +152,6 @@ pub fn mk_slice_vec_e(cx: @ext_ctxt, sp: span, +exprs: ~[@ast::expr]) mk_vstore_e(cx, sp, mk_base_vec_e(cx, sp, exprs), ast::expr_vstore_slice) } -pub fn mk_fixed_vec_e(cx: @ext_ctxt, sp: span, +exprs: ~[@ast::expr]) - -> @ast::expr { - mk_vstore_e(cx, sp, mk_base_vec_e(cx, sp, exprs), - ast::expr_vstore_fixed(None)) -} pub fn mk_base_str(cx: @ext_ctxt, sp: span, +s: ~str) -> @ast::expr { let lit = ast::lit_str(@s); return mk_lit(cx, sp, lit); diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d7af59910b4..754f12cc170 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -28,7 +28,7 @@ use ast::{expr_lit, expr_log, expr_loop, expr_loop_body, expr_mac}; use ast::{expr_method_call, expr_paren, expr_path, expr_repeat}; use ast::{expr_ret, expr_swap, expr_struct, expr_tup, expr_unary}; use ast::{expr_vec, expr_vstore, expr_vstore_mut_box, expr_inline_asm}; -use ast::{expr_vstore_fixed, expr_vstore_slice, expr_vstore_box}; +use ast::{expr_vstore_slice, expr_vstore_box}; use ast::{expr_vstore_mut_slice, expr_while, extern_fn, field, fn_decl}; use ast::{expr_vstore_uniq, TyClosure, TyBareFn, Onceness, Once, Many}; use ast::{foreign_item, foreign_item_const, foreign_item_fn, foreign_mod}; diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index bda5b3671a9..d85b40537fa 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1024,8 +1024,6 @@ pub fn print_vstore(s: @ps, t: ast::vstore) { pub fn print_expr_vstore(s: @ps, t: ast::expr_vstore) { match t { - ast::expr_vstore_fixed(Some(i)) => word(s.s, fmt!("%u", i)), - ast::expr_vstore_fixed(None) => word(s.s, ~"_"), ast::expr_vstore_uniq => word(s.s, ~"~"), ast::expr_vstore_box => word(s.s, ~"@"), ast::expr_vstore_mut_box => { @@ -1100,16 +1098,9 @@ pub fn print_expr(s: @ps, &&expr: @ast::expr) { let ann_node = node_expr(s, expr); (s.ann.pre)(ann_node); match expr.node { - ast::expr_vstore(e, v) => match v { - ast::expr_vstore_fixed(_) => { - print_expr(s, e); - word(s.s, ~"/"); - print_expr_vstore(s, v); - } - _ => { - print_expr_vstore(s, v); - print_expr(s, e); - } + ast::expr_vstore(e, v) => { + print_expr_vstore(s, v); + print_expr(s, e); }, ast::expr_vec(ref exprs, mutbl) => { ibox(s, indent_unit); |
