---

yaml
---
r: 58234
b: refs/heads/auto
c: c752241
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d12d25534b01632f7b19fae85854032ebb1b319c
+refs/heads/auto: c7522417d48c03a110fa8839428424d6dbae1223
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libstd/ebml.rs

@@ -600,11 +600,18 @@ pub mod writer {
     use core::vec;
 
     // ebml writing
+    #[cfg(stage0)]
     pub struct Encoder {
         writer: @io::Writer,
         priv mut size_positions: ~[uint],
     }
 
+    #[cfg(not(stage0))]
+    pub struct Encoder {
+        writer: @io::Writer,
+        priv size_positions: ~[uint],
+    }
+
     fn write_sized_vuint(w: @io::Writer, n: uint, size: uint) {
         match size {
             1u => w.write(&[0x80u8 | (n as u8)]),
@@ -625,9 +632,22 @@ pub mod writer {
         fail!(fmt!("vint to write too big: %?", n));
     }
 
+    #[cfg(stage0)]
+    pub fn Encoder(w: @io::Writer) -> Encoder {
+        let size_positions: ~[uint] = ~[];
+        Encoder {
+            writer: w,
+            mut size_positions: size_positions
+        }
+    }
+
+    #[cfg(not(stage0))]
     pub fn Encoder(w: @io::Writer) -> Encoder {
         let size_positions: ~[uint] = ~[];
-        Encoder { writer: w, mut size_positions: size_positions }
+        Encoder {
+            writer: w,
+            size_positions: size_positions
+        }
     }
 
     // FIXME (#2741): Provide a function to write the standard ebml header.

branches/auto/src/libstd/json.rs

@@ -220,11 +220,18 @@ impl serialize::Encoder for Encoder {
     }
 }
 
+#[cfg(stage0)]
 pub struct PrettyEncoder {
     priv wr: @io::Writer,
     priv mut indent: uint,
 }
 
+#[cfg(not(stage0))]
+pub struct PrettyEncoder {
+    priv wr: @io::Writer,
+    priv indent: uint,
+}
+
 pub fn PrettyEncoder(wr: @io::Writer) -> PrettyEncoder {
     PrettyEncoder {
         wr: wr,
@@ -838,10 +845,16 @@ pub fn from_str(s: &str) -> Result<Json, Error> {
     }
 }
 
+#[cfg(stage0)]
 pub struct Decoder {
     priv mut stack: ~[Json],
 }
 
+#[cfg(not(stage0))]
+pub struct Decoder {
+    priv stack: ~[Json],
+}
+
 pub fn Decoder(json: Json) -> Decoder {
     Decoder {
         stack: ~[json]