---

yaml
---
r: 39851
b: refs/heads/incoming
c: f1d0478
h: refs/heads/master
i:
  39849: a4e40f1
  39847: 07f1fe9
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: fc582bcfcedc5154b98b45bb5e41eddfcd3a1f74
+refs/heads/incoming: f1d04780020fed9f6ade87ab39964f6c459aca33
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/ebml.rs

@@ -379,6 +379,14 @@ pub mod reader {
             f()
         }
 
+        #[cfg(stage0)]
+        fn read_struct<T>(&self, name: &str, f: fn() -> T) -> T {
+            debug!("read_struct(name=%s)", name);
+            f()
+        }
+        #[cfg(stage1)]
+        #[cfg(stage2)]
+        #[cfg(stage3)]
         fn read_struct<T>(&self, name: &str, _len: uint, f: fn() -> T) -> T {
             debug!("read_struct(name=%s)", name);
             f()
@@ -658,6 +666,11 @@ pub mod writer {
         }
 
         fn emit_rec(&self, f: fn()) { f() }
+        #[cfg(stage0)]
+        fn emit_struct(&self, _name: &str, f: fn()) { f() }
+        #[cfg(stage1)]
+        #[cfg(stage2)]
+        #[cfg(stage3)]
         fn emit_struct(&self, _name: &str, _len: uint, f: fn()) { f() }
         fn emit_field(&self, name: &str, _idx: uint, f: fn()) {
             self._emit_label(name);

branches/incoming/src/libstd/json.rs

@@ -157,6 +157,15 @@ pub impl Encoder: serialize::Encoder {
         f();
         self.wr.write_char('}');
     }
+    #[cfg(stage0)]
+    fn emit_struct(&self, _name: &str, f: fn()) {
+        self.wr.write_char('{');
+        f();
+        self.wr.write_char('}');
+    }
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn emit_struct(&self, _name: &str, _len: uint, f: fn()) {
         self.wr.write_char('{');
         f();
@@ -270,6 +279,13 @@ pub impl PrettyEncoder: serialize::Encoder {
         self.indent -= 2;
         self.wr.write_char('}');
     }
+    #[cfg(stage0)]
+    fn emit_struct(&self, _name: &str, f: fn()) {
+        self.emit_rec(f)
+    }
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn emit_struct(&self, _name: &str, _len: uint, f: fn()) {
         self.emit_rec(f)
     }
@@ -870,6 +886,16 @@ pub impl Decoder: serialize::Decoder {
         move value
     }
 
+    #[cfg(stage0)]
+    fn read_struct<T>(&self, _name: &str, f: fn() -> T) -> T {
+        debug!("read_struct()");
+        let value = f();
+        self.pop();
+        move value
+    }
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn read_struct<T>(&self, _name: &str, _len: uint, f: fn() -> T) -> T {
         debug!("read_struct()");
         let value = f();

branches/incoming/src/libstd/prettyprint.rs

@@ -162,6 +162,15 @@ pub impl Serializer: serialize::Encoder {
         self.wr.write_str(~"}");
     }
 
+    #[cfg(stage0)]
+    fn emit_struct(&self, name: &str, f: fn()) {
+        self.wr.write_str(fmt!("%s {", name));
+        f();
+        self.wr.write_str(~"}");
+    }
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn emit_struct(&self, name: &str, _len: uint, f: fn()) {
         self.wr.write_str(fmt!("%s {", name));
         f();

branches/incoming/src/libstd/serialize.rs

@@ -58,6 +58,11 @@ pub trait Encoder {
     fn emit_vec_elt(&self, idx: uint, f: fn());
 
     fn emit_rec(&self, f: fn());
+    #[cfg(stage0)]
+    fn emit_struct(&self, name: &str, f: fn());
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn emit_struct(&self, name: &str, _len: uint, f: fn());
     fn emit_field(&self, f_name: &str, f_idx: uint, f: fn());
 
@@ -99,6 +104,11 @@ pub trait Decoder {
     fn read_vec_elt<T>(&self, idx: uint, f: fn() -> T) -> T;
 
     fn read_rec<T>(&self, f: fn() -> T) -> T;
+    #[cfg(stage0)]
+    fn read_struct<T>(&self, name: &str, f: fn() -> T) -> T;
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn read_struct<T>(&self, name: &str, _len: uint, f: fn() -> T) -> T;
     fn read_field<T>(&self, name: &str, idx: uint, f: fn() -> T) -> T;