Merge remote-tracking branch 'remotes/origin/incoming' into serial

3 files changed, 0 insertions, 65 deletions

diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index ffb8dfd6e83..646f2ce6a84 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -321,19 +321,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);
@@ -373,23 +360,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 d26c1606a5e..d12488ed01f 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -803,19 +803,6 @@ impl serialize::Decoder for Decoder {
         f()
     }
 
-    #[cfg(stage0)]
-    fn read_enum_variant<T>(&self, f: &fn(uint) -> T) -> T {
-        debug!("read_enum_variant()");
-        let idx = match self.stack.pop() {
-            Null => { self.stack.push(Null); 0 },
-            value => { self.stack.push(value); 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.stack.pop() {
diff --git a/src/libstd/serialize.rs b/src/libstd/serialize.rs
index dd487218fe5..9e21d1f980d 100644
--- a/src/libstd/serialize.rs
+++ b/src/libstd/serialize.rs
@@ -83,11 +83,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;
 
@@ -558,23 +553,6 @@ impl<
     K: Decodable<D> + Hash + IterBytes + Eq,
     V: Decodable<D>
 > Decodable<D> for LinearMap<K, V> {
-    #[cfg(stage0)]
-    fn decode(d: &D) -> LinearMap<K, V> {
-        do d.read_map |len| {
-            let mut map = LinearMap::new();
-            map.reserve_at_least(len);
-            for uint::range(0, len) |i| {
-                let key = d.read_map_elt_key(i, || Decodable::decode(d));
-                let val = d.read_map_elt_val(i, || Decodable::decode(d));
-                map.insert(key, val);
-            }
-            map
-        }
-    }
-
-    #[cfg(stage1)]
-    #[cfg(stage2)]
-    #[cfg(stage3)]
     fn decode(d: &D) -> LinearMap<K, V> {
         do d.read_map |len| {
             let mut map = LinearMap::with_capacity(len);