---

yaml
---
r: 24181
b: refs/heads/master
c: cd93441
h: refs/heads/master
i:
  24179: e3f3002
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 99d84bacc8fd3cc6ca55bfcfe86714db6adb48a1
+refs/heads/master: cd93441705b84ab36a314d7f0b721c2fb6b01ecd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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")]
             )
         );