---

yaml
---
r: 30529
b: refs/heads/incoming
c: 43924f1
h: refs/heads/master
i:
  30527: b00b885
v: v3

Author: nikomatsakis

[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: a544b83788cad14f61e9d39262356a9d9bd5bdf0
+refs/heads/incoming: 43924f1f9ffea44390e178a97bef283cb7efbee1
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -2,5 +2,5 @@ fn main() {
     let arr = [1,2,3]/3;
     let struc = {a: 13u8, b: arr, c: 42};
     let s = sys::log_str(struc);
-    assert(s == ~"(13, [1, 2, 3]/3, 42)");
+    assert(s == ~"{ a: 13, b: [ 1, 2, 3 ], c: 42 }");
 }

branches/incoming/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs

@@ -13,6 +13,7 @@ fn check_log<T>(exp: ~str, v: T) {
 fn main() {
     let x = list::from_vec(~[a(22u), b(~"hi")]);
     let exp = ~"@Cons(a(22), @Cons(b(~\"hi\"), @Nil))";
-    assert fmt!("%?", x) == exp;
+    let act = fmt!("%?", x);
+    assert act == exp;
     check_log(exp, x);
 }

branches/incoming/src/test/run-pass/log-str.rs

@@ -1,4 +1,7 @@
 fn main() {
-    assert ~"~[1, 2, 3]" == sys::log_str(~[1, 2, 3]);
-    assert fmt!("%?/%6?", ~[1, 2, 3], ~"hi") == ~"~[1, 2, 3]/ ~\"hi\"";
+    let act = sys::log_str(~[1, 2, 3]);
+    assert ~"~[ 1, 2, 3 ]" == act;
+
+    let act = fmt!("%?/%6?", ~[1, 2, 3], ~"hi");
+    assert act == ~"~[ 1, 2, 3 ]/ ~\"hi\"";
 }

branches/incoming/src/test/run-pass/rec-align-u32.rs

@@ -50,5 +50,5 @@ fn main() {
     // because `inner`s alignment was 4.
     assert sys::size_of::<outer>() == m::size();
 
-    assert y == ~"(22, (44))";
+    assert y == ~"{ c8: 22, t: { c64: 44 } }";
 }

branches/incoming/src/test/run-pass/rec-align-u64.rs

@@ -64,5 +64,5 @@ fn main() {
     // because `inner`s alignment was 4.
     assert sys::size_of::<outer>() == m::m::size();
 
-    assert y == ~"(22, (44))";
+    assert y == ~"{ c8: 22, t: { c64: 44 } }";
 }

branches/incoming/src/test/run-pass/tag-auto-disr-val-shape.rs

@@ -7,8 +7,10 @@ enum color {
 }
 
 fn main() {
-    assert uint::to_str(red as uint, 10u) == fmt!("%?", red);
-    assert uint::to_str(green as uint, 10u) == fmt!("%?", green);
-    assert uint::to_str(white as uint, 10u) == fmt!("%?", white);
+    let act = fmt!("%?", red);
+    io::println(act);
+    assert ~"red" == act;
+    assert ~"green" == fmt!("%?", green);
+    assert ~"white" == fmt!("%?", white);
 }