auto merge of #5623 : brson/rust/snapshot, r=brson

3 files changed, 0 insertions, 49 deletions

diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 98c4b3c6b16..484220776c3 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -334,19 +334,6 @@ pub mod reader {
             self.push_doc(self.next_doc(EsEnum), f)
         }
 
-        #[cfg(stage0)]
-        fn read_enum_variant<T>(&self, f: &fn(uint) -> T) -> T {
-            debug!("read_enum_variant()");
-            let idx = self._next_uint(EsEnumVid);
-            debug!("  idx=%u", idx);
-            do self.push_doc(self.next_doc(EsEnumBody)) {
-                f(idx)
-            }
-        }
-
-        #[cfg(stage1)]
-        #[cfg(stage2)]
-        #[cfg(stage3)]
         fn read_enum_variant<T>(&self, _names: &[&str], f: &fn(uint) -> T) -> T {
             debug!("read_enum_variant()");
             let idx = self._next_uint(EsEnumVid);
@@ -410,23 +397,6 @@ pub mod reader {
             f()
         }
 
-        #[cfg(stage0)]
-        fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
-            debug!("read_option()");
-            do self.read_enum("Option") || {
-                do self.read_enum_variant |idx| {
-                    match idx {
-                        0 => f(false),
-                        1 => f(true),
-                        _ => fail!(),
-                    }
-                }
-            }
-        }
-
-        #[cfg(stage1)]
-        #[cfg(stage2)]
-        #[cfg(stage3)]
         fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
             debug!("read_option()");
             do self.read_enum("Option") || {
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 4b0e313330d..190d2d3fe0b 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -854,19 +854,6 @@ impl<'self> serialize::Decoder for Decoder<'self> {
         f()
     }
 
-    #[cfg(stage0)]
-    fn read_enum_variant<T>(&self, f: &fn(uint) -> T) -> T {
-        debug!("read_enum_variant()");
-        let idx = match *self.peek() {
-            Null => 0,
-            _ => 1,
-        };
-        f(idx)
-    }
-
-    #[cfg(stage1)]
-    #[cfg(stage2)]
-    #[cfg(stage3)]
     fn read_enum_variant<T>(&self, names: &[&str], f: &fn(uint) -> T) -> T {
         debug!("read_enum_variant(names=%?)", names);
         let name = match *self.peek() {
diff --git a/src/libstd/serialize.rs b/src/libstd/serialize.rs
index 3c9ad0d77d1..8e7ab318e17 100644
--- a/src/libstd/serialize.rs
+++ b/src/libstd/serialize.rs
@@ -93,12 +93,6 @@ pub trait Decoder {
     // Compound types:
     fn read_enum<T>(&self, name: &str, f: &fn() -> T) -> T;
 
-    #[cfg(stage0)]
-    fn read_enum_variant<T>(&self, f: &fn(uint) -> T) -> T;
-
-    #[cfg(stage1)]
-    #[cfg(stage2)]
-    #[cfg(stage3)]
     fn read_enum_variant<T>(&self, names: &[&str], f: &fn(uint) -> T) -> T;
 
     fn read_enum_variant_arg<T>(&self, idx: uint, f: &fn() -> T) -> T;