diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs index cc3d080d30e..dc379cec21b 100644 --- a/src/libstd/ebml.rs +++ b/src/libstd/ebml.rs @@ -379,14 +379,6 @@ pub mod reader { f() } - #[cfg(stage0)] - fn read_struct(&self, name: &str, f: fn() -> T) -> T { - debug!("read_struct(name=%s)", name); - f() - } - #[cfg(stage1)] - #[cfg(stage2)] - #[cfg(stage3)] fn read_struct(&self, name: &str, _len: uint, f: fn() -> T) -> T { debug!("read_struct(name=%s)", name); f() @@ -666,11 +658,6 @@ 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); diff --git a/src/libstd/json.rs b/src/libstd/json.rs index ed3dbb48b2a..45d467095fb 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -157,15 +157,6 @@ 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(); @@ -279,13 +270,6 @@ 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) } @@ -888,16 +872,6 @@ pub impl Decoder: serialize::Decoder { move value } - #[cfg(stage0)] - fn read_struct(&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(&self, _name: &str, _len: uint, f: fn() -> T) -> T { debug!("read_struct()"); let value = f(); diff --git a/src/libstd/prettyprint.rs b/src/libstd/prettyprint.rs index f122031a81a..d07c29d624c 100644 --- a/src/libstd/prettyprint.rs +++ b/src/libstd/prettyprint.rs @@ -162,15 +162,6 @@ 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(); diff --git a/src/libstd/serialize.rs b/src/libstd/serialize.rs index 00fa235a742..6e70f844e42 100644 --- a/src/libstd/serialize.rs +++ b/src/libstd/serialize.rs @@ -58,11 +58,6 @@ 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()); @@ -104,11 +99,6 @@ pub trait Decoder { fn read_vec_elt(&self, idx: uint, f: fn() -> T) -> T; fn read_rec(&self, f: fn() -> T) -> T; - #[cfg(stage0)] - fn read_struct(&self, name: &str, f: fn() -> T) -> T; - #[cfg(stage1)] - #[cfg(stage2)] - #[cfg(stage3)] fn read_struct(&self, name: &str, _len: uint, f: fn() -> T) -> T; fn read_field(&self, name: &str, idx: uint, f: fn() -> T) -> T; diff --git a/src/snapshots.txt b/src/snapshots.txt index a42d4d53130..1848cbcd26a 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,11 @@ +S 2013-01-23 e8f4da7 + macos-i386 6860345b8d05986ae1b20c7532fd9667dff31b2a + macos-x86_64 d0c6131e4afe93759af08d88e81cd7a8496595f0 + linux-i386 a41da80a81529b245c51a9fbff59da2ed291d7fa + linux-x86_64 4628051624500e7a1085bc08bb629c678aa112c2 + freebsd-x86_64 d1981eb02a7e97496309b783693d8b50489e6f58 + winnt-i386 7ef2b440a1e0345084a4caeb1b2d6bf82a9378c2 + S 2012-12-19 8554d5e linux-i386 9323192fd4d1502621d3a4fcc2ba65ee03d8b94b linux-x86_64 8334f2d82b8f3c4ee8480a5ee61d9a231045a327