---

yaml
---
r: 97395
b: refs/heads/dist-snap
c: ada9150
h: refs/heads/master
i:
  97393: 758642c
  97391: 28d6dcd
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 39f0270544af19bf51b0088c93fe5cf58a8eccbe
+refs/heads/dist-snap: ada9150abf26912478aa6f613602f8ac7ba135e5
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libsyntax/ext/expand.rs

@@ -1319,7 +1319,7 @@ mod test {
     }
 
     fn fake_print_crate(crate: &ast::Crate) {
-        let out = @mut std::io::stderr() as @mut std::io::Writer;
+        let mut out = ~std::io::stderr() as ~std::io::Writer;
         let s = pprust::rust_printer(out, get_ident_interner());
         pprust::print_crate_(s, crate);
     }

branches/dist-snap/src/libsyntax/print/pprust.rs

@@ -122,7 +122,7 @@ pub fn print_crate(cm: @CodeMap,
                    span_diagnostic: @diagnostic::SpanHandler,
                    crate: &ast::Crate,
                    filename: @str,
-                   input: @mut io::Reader,
+                   input: &mut io::Reader,
                    out: ~io::Writer,
                    ann: @pp_ann,
                    is_expanded: bool) {
@@ -211,13 +211,8 @@ pub fn fun_to_str(decl: &ast::fn_decl, purity: ast::purity, name: ast::Ident,
     end(&mut s); // Close the head box
     end(&mut s); // Close the outer box
     eof(&mut s.s);
-
-    // XXX(pcwalton): Need checked downcasts.
     unsafe {
-        let (_, wr): (uint, ~MemWriter) = cast::transmute(s.s.out);
-        let result = str::from_utf8_owned(wr.inner_ref().to_owned());
-        cast::forget(wr);
-        result
+        get_mem_writer(&mut s.s.out)
     }
 }
 
@@ -230,13 +225,8 @@ pub fn block_to_str(blk: &ast::Block, intr: @ident_interner) -> ~str {
     ibox(&mut s, 0u);
     print_block(&mut s, blk);
     eof(&mut s.s);
-
-    // XXX(pcwalton): Need checked downcasts.
     unsafe {
-        let (_, wr): (uint, ~MemWriter) = cast::transmute(s.s.out);
-        let result = str::from_utf8_owned(wr.inner_ref().to_owned());
-        cast::forget(wr);
-        result
+        get_mem_writer(&mut s.s.out)
     }
 }
 
@@ -2318,17 +2308,23 @@ pub fn print_string(s: &mut ps, st: &str, style: ast::StrStyle) {
     word(&mut s.s, st);
 }
 
+// XXX(pcwalton): A nasty function to extract the string from an `io::Writer`
+// that we "know" to be a `MemWriter` that works around the lack of checked
+// downcasts.
+unsafe fn get_mem_writer(writer: &mut ~io::Writer) -> ~str {
+    let (_, wr): (uint, ~MemWriter) = cast::transmute_copy(writer);
+    let result = str::from_utf8_owned(wr.inner_ref().to_owned());
+    cast::forget(wr);
+    result
+}
+
 pub fn to_str<T>(t: &T, f: |&mut ps, &T|, intr: @ident_interner) -> ~str {
     let wr = ~MemWriter::new();
     let mut s = rust_printer(wr as ~io::Writer, intr);
     f(&mut s, t);
     eof(&mut s.s);
-    // XXX(pcwalton): Need checked downcasts.
     unsafe {
-        let (_, wr): (uint, ~MemWriter) = cast::transmute(s.s.out);
-        let result = str::from_utf8_owned(wr.inner_ref().to_owned());
-        cast::forget(wr);
-        result
+        get_mem_writer(&mut s.s.out)
     }
 }