std: clean up the order of {De,En}codable methods

1 files changed, 49 insertions, 49 deletions

diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 90a745aaeb9..3714adb3055 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -130,17 +130,6 @@ impl serialize::Encoder for Encoder {
         f();
     }
 
-    fn emit_seq(&self, _len: uint, f: &fn()) {
-        self.wr.write_char('[');
-        f();
-        self.wr.write_char(']');
-    }
-
-    fn emit_seq_elt(&self, idx: uint, f: &fn()) {
-        if idx != 0 { self.wr.write_char(','); }
-        f()
-    }
-
     fn emit_struct(&self, _name: &str, _len: uint, f: &fn()) {
         self.wr.write_char('{');
         f();
@@ -157,6 +146,17 @@ impl serialize::Encoder for Encoder {
     fn emit_option_none(&self) { self.emit_nil(); }
     fn emit_option_some(&self, f: &fn()) { f(); }
 
+    fn emit_seq(&self, _len: uint, f: &fn()) {
+        self.wr.write_char('[');
+        f();
+        self.wr.write_char(']');
+    }
+
+    fn emit_seq_elt(&self, idx: uint, f: &fn()) {
+        if idx != 0 { self.wr.write_char(','); }
+        f()
+    }
+
     fn emit_map(&self, _len: uint, f: &fn()) {
         self.wr.write_char('{');
         f();
@@ -241,58 +241,58 @@ impl serialize::Encoder for PrettyEncoder {
         f()
     }
 
-    fn emit_seq(&self, len: uint, f: &fn()) {
+    fn emit_struct(&self, _name: &str, len: uint, f: &fn()) {
         if len == 0 {
-            self.wr.write_str("[]");
+            self.wr.write_str("{}");
         } else {
-            self.wr.write_char('[');
+            self.wr.write_char('{');
             self.indent += 2;
             f();
             self.wr.write_char('\n');
             self.indent -= 2;
             self.wr.write_str(spaces(self.indent));
-            self.wr.write_char(']');
+            self.wr.write_char('}');
         }
     }
-    fn emit_seq_elt(&self, idx: uint, f: &fn()) {
+    fn emit_field(&self, name: &str, idx: uint, f: &fn()) {
         if idx == 0 {
             self.wr.write_char('\n');
         } else {
             self.wr.write_str(",\n");
         }
         self.wr.write_str(spaces(self.indent));
-        f()
+        self.wr.write_str(escape_str(name));
+        self.wr.write_str(": ");
+        f();
     }
 
-    fn emit_struct(&self, _name: &str, len: uint, f: &fn()) {
+    fn emit_option(&self, f: &fn()) { f(); }
+    fn emit_option_none(&self) { self.emit_nil(); }
+    fn emit_option_some(&self, f: &fn()) { f(); }
+
+    fn emit_seq(&self, len: uint, f: &fn()) {
         if len == 0 {
-            self.wr.write_str("{}");
+            self.wr.write_str("[]");
         } else {
-            self.wr.write_char('{');
+            self.wr.write_char('[');
             self.indent += 2;
             f();
             self.wr.write_char('\n');
             self.indent -= 2;
             self.wr.write_str(spaces(self.indent));
-            self.wr.write_char('}');
+            self.wr.write_char(']');
         }
     }
-    fn emit_field(&self, name: &str, idx: uint, f: &fn()) {
+    fn emit_seq_elt(&self, idx: uint, f: &fn()) {
         if idx == 0 {
             self.wr.write_char('\n');
         } else {
             self.wr.write_str(",\n");
         }
         self.wr.write_str(spaces(self.indent));
-        self.wr.write_str(escape_str(name));
-        self.wr.write_str(": ");
-        f();
+        f()
     }
 
-    fn emit_option(&self, f: &fn()) { f(); }
-    fn emit_option_none(&self) { self.emit_nil(); }
-    fn emit_option_some(&self, f: &fn()) { f(); }
-
     fn emit_map(&self, len: uint, f: &fn()) {
         if len == 0 {
             self.wr.write_str("{}");
@@ -827,26 +827,6 @@ impl serialize::Decoder for Decoder {
         f()
     }
 
-    fn read_seq<T>(&self, f: &fn(uint) -> T) -> T {
-        debug!("read_seq()");
-        let len = match self.stack.pop() {
-            List(list) => {
-                let len = list.len();
-                do vec::consume_reverse(list) |_i, v| {
-                    self.stack.push(v);
-                }
-                len
-            }
-            _ => fail!(~"not a list"),
-        };
-        f(len)
-    }
-
-    fn read_seq_elt<T>(&self, idx: uint, f: &fn() -> T) -> T {
-        debug!("read_seq_elt(idx=%u)", idx);
-        f()
-    }
-
     fn read_struct<T>(&self, name: &str, len: uint, f: &fn() -> T) -> T {
         debug!("read_struct(name=%s, len=%u)", name, len);
         let value = f();
@@ -880,6 +860,26 @@ impl serialize::Decoder for Decoder {
         }
     }
 
+    fn read_seq<T>(&self, f: &fn(uint) -> T) -> T {
+        debug!("read_seq()");
+        let len = match self.stack.pop() {
+            List(list) => {
+                let len = list.len();
+                do vec::consume_reverse(list) |_i, v| {
+                    self.stack.push(v);
+                }
+                len
+            }
+            _ => fail!(~"not a list"),
+        };
+        f(len)
+    }
+
+    fn read_seq_elt<T>(&self, idx: uint, f: &fn() -> T) -> T {
+        debug!("read_seq_elt(idx=%u)", idx);
+        f()
+    }
+
     fn read_map<T>(&self, f: &fn(uint) -> T) -> T {
         debug!("read_map()");
         let len = match self.stack.pop() {