Skip to content

Commit 65aca06

Browse files
ericktnikomatsakis
authored andcommitted
---
yaml --- r: 22235 b: refs/heads/snap-stage3 c: 372c7de h: refs/heads/master i: 22233: f6f3a71 22231: e5a8385 v: v3
1 parent 6925aa8 commit 65aca06

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 4f4160ee3bd4ca0779821c24240af525d07d859a
4+
refs/heads/snap-stage3: 372c7de20104bd3f968cda6429dfad2c1d559a35
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/run-pass/auto_serialize2.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use std::serialization2::{Serializable, Deserializable, deserialize};
1010
use std::prettyprint2;
1111

1212
fn test_ser_and_deser<A:Eq Serializable Deserializable>(
13-
a1: A,
14-
expected: ~str
13+
a1: &A,
14+
+expected: ~str
1515
) {
1616
// check the pretty printer:
1717
let s = do io::with_str_writer |w| {
@@ -27,7 +27,7 @@ fn test_ser_and_deser<A:Eq Serializable Deserializable>(
2727
};
2828
let d = ebml2::Doc(@bytes);
2929
let a2: A = deserialize(&ebml2::Deserializer(d));
30-
assert a1 == a2;
30+
assert *a1 == a2;
3131
}
3232

3333
#[auto_serialize2]
@@ -121,7 +121,7 @@ type SomeRec = {v: ~[uint]};
121121
enum AnEnum = SomeRec;
122122

123123
#[auto_serialize2]
124-
type Point = {x: uint, y: uint};
124+
struct Point {x: uint, y: uint}
125125

126126
#[auto_serialize2]
127127
enum Quark<T> {
@@ -133,24 +133,24 @@ enum Quark<T> {
133133
enum CLike { A, B, C }
134134

135135
fn main() {
136-
test_ser_and_deser(Plus(@Minus(@Val(3u), @Val(10u)),
137-
@Plus(@Val(22u), @Val(5u))),
136+
test_ser_and_deser(&Plus(@Minus(@Val(3u), @Val(10u)),
137+
@Plus(@Val(22u), @Val(5u))),
138138
~"Plus(@Minus(@Val(3u), @Val(10u)), \
139139
@Plus(@Val(22u), @Val(5u)))");
140140

141-
test_ser_and_deser({lo: 0u, hi: 5u, node: 22u},
141+
test_ser_and_deser(&{lo: 0u, hi: 5u, node: 22u},
142142
~"{lo: 0u, hi: 5u, node: 22u}");
143143

144-
test_ser_and_deser(AnEnum({v: ~[1u, 2u, 3u]}),
144+
test_ser_and_deser(&AnEnum({v: ~[1u, 2u, 3u]}),
145145
~"AnEnum({v: ~[1u, 2u, 3u]})");
146146

147-
test_ser_and_deser({x: 3u, y: 5u}, ~"{x: 3u, y: 5u}");
147+
test_ser_and_deser(&Point {x: 3u, y: 5u}, ~"Point {x: 3u, y: 5u}");
148148

149-
test_ser_and_deser(@[1u, 2u, 3u], ~"@[1u, 2u, 3u]");
149+
test_ser_and_deser(&@[1u, 2u, 3u], ~"@[1u, 2u, 3u]");
150150

151-
test_ser_and_deser(Top(22u), ~"Top(22u)");
152-
test_ser_and_deser(Bottom(222u), ~"Bottom(222u)");
151+
test_ser_and_deser(&Top(22u), ~"Top(22u)");
152+
test_ser_and_deser(&Bottom(222u), ~"Bottom(222u)");
153153

154-
test_ser_and_deser(A, ~"A");
155-
test_ser_and_deser(B, ~"B");
154+
test_ser_and_deser(&A, ~"A");
155+
test_ser_and_deser(&B, ~"B");
156156
}

0 commit comments

Comments
 (0)