diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2012-09-19 20:22:38 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-09-26 16:20:24 -0700 |
| commit | cd93441705b84ab36a314d7f0b721c2fb6b01ecd (patch) | |
| tree | 8d92397eeda215d13951459342b1a7ea71206c20 | |
| parent | 99d84bacc8fd3cc6ca55bfcfe86714db6adb48a1 (diff) | |
| download | rust-cd93441705b84ab36a314d7f0b721c2fb6b01ecd.tar.gz rust-cd93441705b84ab36a314d7f0b721c2fb6b01ecd.zip | |
auto_serialize2 should fully qualify std::serialization2::deserialize
| -rw-r--r-- | src/libsyntax/ext/auto_serialize2.rs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/libsyntax/ext/auto_serialize2.rs b/src/libsyntax/ext/auto_serialize2.rs index 315a63a406e..e2e308f7e2c 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")] ) ); |