std: remove Encoder::emit_tup{,_elt} and Decoder::read_tup{,_elt}

diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 18cf807f4f176f611dd54ac693f559c6f3fb805f..12a4ea149093a97fb5bee6c48423d06cd1adf9b3 100644 (file)
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -378,16 +378,6 @@ fn read_field<T>(&self, name: &str, idx: uint, f: &fn() -> T) -> T {
             f()
         }
 
-        fn read_tup<T>(&self, len: uint, f: &fn() -> T) -> T {
-            debug!("read_tup(len=%u)", len);
-            f()
-        }
-
-        fn read_tup_elt<T>(&self, idx: uint, f: &fn() -> T) -> T {
-            debug!("read_tup_elt(idx=%u)", idx);
-            f()
-        }
-
         #[cfg(stage0)]
         fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
             debug!("read_option()");
@@ -661,9 +651,6 @@ fn emit_field(&self, name: &str, _idx: uint, f: &fn()) {
             f()
         }
 
-        fn emit_tup(&self, _len: uint, f: &fn()) { f() }
-        fn emit_tup_elt(&self, _idx: uint, f: &fn()) { f() }
-
         fn emit_option(&self, f: &fn()) {
             self.emit_enum("Option", f);
         }

diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index d2dd9bc34326ecdfe0cd1ea2c4d85720d025e3ef..fe5b0cf88e674445e1da11f4b39fb95c19a51151 100644 (file)
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -158,13 +158,6 @@ fn emit_field(&self, name: &str, idx: uint, f: &fn()) {
         f();
     }
 
-    fn emit_tup(&self, len: uint, f: &fn()) {
-        self.emit_seq(len, f);
-    }
-    fn emit_tup_elt(&self, idx: uint, f: &fn()) {
-        self.emit_seq_elt(idx, f)
-    }
-
     fn emit_option(&self, f: &fn()) { f(); }
     fn emit_option_none(&self) { self.emit_nil(); }
     fn emit_option_some(&self, f: &fn()) { f(); }
@@ -287,12 +280,6 @@ fn emit_field(&self, name: &str, idx: uint, f: &fn()) {
         self.wr.write_str(": ");
         f();
     }
-    fn emit_tup(&self, sz: uint, f: &fn()) {
-        self.emit_seq(sz, f);
-    }
-    fn emit_tup_elt(&self, idx: uint, f: &fn()) {
-        self.emit_seq_elt(idx, f)
-    }
 
     fn emit_option(&self, f: &fn()) { f(); }
     fn emit_option_none(&self) { self.emit_nil(); }
@@ -905,24 +892,6 @@ fn read_field<T>(&self, name: &str, idx: uint, f: &fn() -> T) -> T {
         }
     }
 
-    fn read_tup<T>(&self, len: uint, f: &fn() -> T) -> T {
-        debug!("read_tup(len=%u)", len);
-        let value = f();
-        self.pop();
-        value
-    }
-
-    fn read_tup_elt<T>(&self, idx: uint, f: &fn() -> T) -> T {
-        debug!("read_tup_elt(idx=%u)", idx);
-        match *self.peek() {
-            List(ref list) => {
-                self.stack.push(&list[idx]);
-                f()
-            }
-            _ => fail!(~"not a list")
-        }
-    }
-
     fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
         match *self.peek() {
             Null => { self.pop(); f(false) }

diff --git a/src/libstd/serialize.rs b/src/libstd/serialize.rs
index 512a12aace8f465467f664629fe9d5de99b18c12..d0127bb09991528bbf140575cb7c2eb4033fb3cd 100644 (file)
--- a/src/libstd/serialize.rs
+++ b/src/libstd/serialize.rs
@@ -53,9 +53,6 @@ pub trait Encoder {
     fn emit_struct(&self, name: &str, _len: uint, f: &fn());
     fn emit_field(&self, f_name: &str, f_idx: uint, f: &fn());
 
-    fn emit_tup(&self, len: uint, f: &fn());
-    fn emit_tup_elt(&self, idx: uint, f: &fn());
-
     // Specialized types:
     fn emit_option(&self, f: &fn());
     fn emit_option_none(&self);
@@ -99,9 +96,6 @@ pub trait Decoder {
     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;
 
-    fn read_tup<T>(&self, sz: uint, f: &fn() -> T) -> T;
-    fn read_tup_elt<T>(&self, idx: uint, f: &fn() -> T) -> T;
-
     // Specialized types:
     fn read_option<T>(&self, f: &fn(bool) -> T) -> T;
 }

diff --git a/src/libsyntax/ext/auto_encode.rs b/src/libsyntax/ext/auto_encode.rs
index 4b262df36a620694592d7f2d874c7791ae8a8e0f..d4e1fa3abf737242f67d1eafa4f3b9669aad2411 100644 (file)
--- a/src/libsyntax/ext/auto_encode.rs
+++ b/src/libsyntax/ext/auto_encode.rs
@@ -1272,13 +1272,6 @@ fn emit_field(&self, name: &str, +idx: uint, f: &fn()) {
             self.add_to_log(CallToEmitField (name.to_str(),idx)); f();
         }
 
-        fn emit_tup(&self, +_len: uint, f: &fn()) {
-            self.add_unknown_to_log(); f();
-        }
-        fn emit_tup_elt(&self, +_idx: uint, f: &fn()) {
-            self.add_unknown_to_log(); f();
-        }
-
         fn emit_option(&self, f: &fn()) {
             self.add_to_log(CallToEmitOption);
             f();