---

yaml
---
r: 57022
b: refs/heads/try
c: 1a36b0f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
-refs/heads/try: 10e6869a54b3d9e703ca6bc29f49f522ee25d865
+refs/heads/try: 1a36b0f17ef0b59411981fdd25ac9ce4ba7e20e0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/astencode.rs

@@ -1336,7 +1336,17 @@ fn roundtrip(in_item: Option<@ast::item>) {
     let ebml_doc = reader::Doc(@bytes);
     let out_item = decode_item_ast(ebml_doc);
 
-    assert_eq!(in_item, out_item);
+    let exp_str = do io::with_str_writer |w| {
+        in_item.encode(&prettyprint::Serializer(w))
+    };
+    let out_str = do io::with_str_writer |w| {
+        out_item.encode(&prettyprint::Serializer(w))
+    };
+
+    debug!("expected string: %s", exp_str);
+    debug!("actual string  : %s", out_str);
+
+    assert!(exp_str == out_str);
 }
 
 #[test]

branches/try/src/test/run-pass/auto-encode.rs

@@ -25,6 +25,20 @@ use std::ebml;
 use std::serialize::{Decodable, Encodable};
 use std::time;
 
+<<<<<<< HEAD
+=======
+fn test_prettyprint<A:Encodable<prettyprint::Serializer>>(
+    a: &A,
+    expected: &~str
+) {
+    let s = do io::with_str_writer |w| {
+        a.encode(&prettyprint::Serializer(w))
+    };
+    debug!("s == %?", s);
+    assert!(s == *expected);
+}
+
+>>>>>>> librustc: Remove `fail_unless!`
 fn test_ebml<A:
     Eq +
     Encodable<EBWriter::Encoder> +