---

yaml
---
r: 97118
b: refs/heads/dist-snap
c: 2551344
h: refs/heads/master
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: b9f0d9bdc193bb4d7923b0a033ab7e19b1419fc8
+refs/heads/dist-snap: 2551344928a7ad30b2ced2b31bf6cdc2eb98554e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/metadata/encoder.rs

@@ -1794,7 +1794,7 @@ pub static metadata_encoding_version : &'static [u8] =
       0, 0, 0, 1 ];
 
 pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
-    let wr = @mut MemWriter::new();
+    let mut wr = MemWriter::new();
     let stats = Stats {
         inline_bytes: 0,
         attr_bytes: 0,
@@ -1837,7 +1837,7 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
         reachable: reachable,
      };
 
-    let mut ebml_w = writer::Encoder(wr);
+    let mut ebml_w = writer::Encoder(&mut wr);
 
     encode_hash(&mut ebml_w, ecx.link_meta.crate_hash);
 
@@ -1921,7 +1921,7 @@ pub fn encoded_ty(tcx: ty::ctxt, t: ty::t) -> ~str {
         ds: def_to_str,
         tcx: tcx,
         abbrevs: tyencode::ac_no_abbrevs};
-    let wr = @mut MemWriter::new();
-    tyencode::enc_ty(wr, cx, t);
+    let mut wr = MemWriter::new();
+    tyencode::enc_ty(&mut wr, cx, t);
     str::from_utf8_owned(wr.inner_ref().to_owned())
 }