From 372c7de20104bd3f968cda6429dfad2c1d559a35 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Mon, 1 Oct 2012 11:35:27 -0700 Subject: [PATCH] Add struct to auto_serialize2 test --- src/test/run-pass/auto_serialize2.rs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/run-pass/auto_serialize2.rs b/src/test/run-pass/auto_serialize2.rs index 8328c4a5126..f3f7e80e8a2 100644 --- a/src/test/run-pass/auto_serialize2.rs +++ b/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( - 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( }; 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 { @@ -133,24 +133,24 @@ enum Quark { 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"); }