---

yaml
---
r: 30943
b: refs/heads/incoming
c: 372c7de
h: refs/heads/master
i:
  30941: d921568
  30939: 065bdca
  30935: 894ce43
  30927: 3343e7e
  30911: 66f7a32
v: v3

Author: erickt

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 4f4160ee3bd4ca0779821c24240af525d07d859a
+refs/heads/incoming: 372c7de20104bd3f968cda6429dfad2c1d559a35
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/run-pass/auto_serialize2.rs

@@ -10,8 +10,8 @@ use std::serialization2::{Serializable, Deserializable, deserialize};
 use std::prettyprint2;
 
 fn test_ser_and_deser<A:Eq Serializable Deserializable>(
-    a1: A,
-    expected: ~str
+    a1: &A,
+    +expected: ~str
 ) {
     // check the pretty printer:
     let s = do io::with_str_writer |w| {
@@ -27,7 +27,7 @@ fn test_ser_and_deser<A:Eq Serializable Deserializable>(
     };
     let d = ebml2::Doc(@bytes);
     let a2: A = deserialize(&ebml2::Deserializer(d));
-    assert a1 == a2;
+    assert *a1 == a2;
 }
 
 #[auto_serialize2]
@@ -121,7 +121,7 @@ type SomeRec = {v: ~[uint]};
 enum AnEnum = SomeRec;
 
 #[auto_serialize2]
-type Point = {x: uint, y: uint};
+struct Point {x: uint, y: uint}
 
 #[auto_serialize2]
 enum Quark<T> {
@@ -133,24 +133,24 @@ enum Quark<T> {
 enum CLike { A, B, C }
 
 fn main() {
-    test_ser_and_deser(Plus(@Minus(@Val(3u), @Val(10u)),
-                            @Plus(@Val(22u), @Val(5u))),
+    test_ser_and_deser(&Plus(@Minus(@Val(3u), @Val(10u)),
+                             @Plus(@Val(22u), @Val(5u))),
                        ~"Plus(@Minus(@Val(3u), @Val(10u)), \
                         @Plus(@Val(22u), @Val(5u)))");
 
-    test_ser_and_deser({lo: 0u, hi: 5u, node: 22u},
+    test_ser_and_deser(&{lo: 0u, hi: 5u, node: 22u},
                        ~"{lo: 0u, hi: 5u, node: 22u}");
 
-    test_ser_and_deser(AnEnum({v: ~[1u, 2u, 3u]}),
+    test_ser_and_deser(&AnEnum({v: ~[1u, 2u, 3u]}),
                        ~"AnEnum({v: ~[1u, 2u, 3u]})");
 
-    test_ser_and_deser({x: 3u, y: 5u}, ~"{x: 3u, y: 5u}");
+    test_ser_and_deser(&Point {x: 3u, y: 5u}, ~"Point {x: 3u, y: 5u}");
 
-    test_ser_and_deser(@[1u, 2u, 3u], ~"@[1u, 2u, 3u]");
+    test_ser_and_deser(&@[1u, 2u, 3u], ~"@[1u, 2u, 3u]");
 
-    test_ser_and_deser(Top(22u), ~"Top(22u)");
-    test_ser_and_deser(Bottom(222u), ~"Bottom(222u)");
+    test_ser_and_deser(&Top(22u), ~"Top(22u)");
+    test_ser_and_deser(&Bottom(222u), ~"Bottom(222u)");
 
-    test_ser_and_deser(A, ~"A");
-    test_ser_and_deser(B, ~"B");
+    test_ser_and_deser(&A, ~"A");
+    test_ser_and_deser(&B, ~"B");
 }