From 8a8f200d102294cf1bd90cdacad995abccda7934 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Tue, 11 Sep 2012 21:25:01 -0700 Subject: Introduce auto adjustment table to subsume autoderef/autoref/borrowings. Fixes #3261 Fixes #3443 --- src/libsyntax/ext/auto_serialize.rs | 2 +- src/libsyntax/ext/build.rs | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/auto_serialize.rs b/src/libsyntax/ext/auto_serialize.rs index 6a31dac2e8f..52357ca4752 100644 --- a/src/libsyntax/ext/auto_serialize.rs +++ b/src/libsyntax/ext/auto_serialize.rs @@ -260,7 +260,7 @@ impl ext_ctxt: ext_ctxt_helpers { ast::expr_lit( @{node: ast::lit_str(s), span: span})), - ast::vstore_uniq)) + ast::expr_vstore_uniq)) } fn lit_uint(span: span, i: uint) -> @ast::expr { diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 12fbb00e6c6..8574c0c9082 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -65,24 +65,26 @@ fn mk_base_vec_e(cx: ext_ctxt, sp: span, exprs: ~[@ast::expr]) -> let vecexpr = ast::expr_vec(exprs, ast::m_imm); mk_expr(cx, sp, vecexpr) } -fn mk_vstore_e(cx: ext_ctxt, sp: span, expr: @ast::expr, vst: ast::vstore) -> +fn mk_vstore_e(cx: ext_ctxt, sp: span, expr: @ast::expr, + vst: ast::expr_vstore) -> @ast::expr { mk_expr(cx, sp, ast::expr_vstore(expr, vst)) } fn mk_uniq_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::vstore_uniq) + mk_vstore_e(cx, sp, mk_base_vec_e(cx, sp, exprs), ast::expr_vstore_uniq) } 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::vstore_fixed(None)) + mk_vstore_e(cx, sp, mk_base_vec_e(cx, sp, exprs), + ast::expr_vstore_fixed(None)) } 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); } fn mk_uniq_str(cx: ext_ctxt, sp: span, s: ~str) -> @ast::expr { - mk_vstore_e(cx, sp, mk_base_str(cx, sp, s), ast::vstore_uniq) + mk_vstore_e(cx, sp, mk_base_str(cx, sp, s), ast::expr_vstore_uniq) } fn mk_rec_e(cx: ext_ctxt, sp: span, -- cgit 1.4.1-3-g733a5