From cd93441705b84ab36a314d7f0b721c2fb6b01ecd Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Wed, 19 Sep 2012 20:22:38 -0700 Subject: [PATCH] auto_serialize2 should fully qualify std::serialization2::deserialize --- src/libsyntax/ext/auto_serialize2.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libsyntax/ext/auto_serialize2.rs b/src/libsyntax/ext/auto_serialize2.rs index 315a63a406eb..e2e308f7e2c7 100644 --- a/src/libsyntax/ext/auto_serialize2.rs +++ b/src/libsyntax/ext/auto_serialize2.rs @@ -437,12 +437,16 @@ fn mk_deser_fields( f: fn(~[ast::field]) -> @ast::expr ) -> @ast::expr { let fields = do fields.mapi |idx, field| { - // ast for `|| deserialize(__d)` + // ast for `|| std::serialization2::deserialize(__d)` let expr_lambda = cx.lambda( cx.expr_blk( cx.expr_call( span, - cx.expr_var(span, ~"deserialize"), + cx.expr_path(span, ~[ + cx.ident_of(~"std"), + cx.ident_of(~"serialization2"), + cx.ident_of(~"deserialize"), + ]), ~[cx.expr_var(span, ~"__d")] ) ) @@ -635,11 +639,15 @@ fn mk_enum_deser_variant_nary( args: ~[ast::variant_arg] ) -> @ast::expr { let args = do args.mapi |idx, _arg| { - // ast for `|| deserialize(__d)` + // ast for `|| std::serialization2::deserialize(__d)` let expr_lambda = cx.lambda_expr( cx.expr_call( span, - cx.expr_var(span, ~"deserialize"), + cx.expr_path(span, ~[ + cx.ident_of(~"std"), + cx.ident_of(~"serialization2"), + cx.ident_of(~"deserialize"), + ]), ~[cx.expr_var(span, ~"__d")] ) );