---

yaml
---
r: 44338
b: refs/heads/master
c: fe82374
h: refs/heads/master
v: v3

Author: jbclements

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 765961438d0a3f8f37f1e38160f6dca04870ae10
+refs/heads/master: fe823743287fedd520e6c95b2380b7702c3fd966
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/libstd/json.rs

@@ -122,24 +122,21 @@ pub impl Encoder: serialize::Encoder {
     fn emit_managed(&self, f: fn()) { f() }
 
     fn emit_enum(&self, name: &str, f: fn()) {
+        f()
+    }
+    
+    fn emit_enum_variant(&self, _name: &str, id: uint, _cnt: uint, f: fn()) {
         // emitting enums as arrays where the first
         // element provides the enum variant name
         self.wr.write_char('[');
-        self.wr.write_str(name);
+        self.wr.write_str(escape_str(_name));
         self.wr.write_char(',');
         f();
         self.wr.write_char(']');
     }
-    
-    fn emit_enum_variant(&self, _name: &str, id: uint, _cnt: uint, f: fn()) {
-        if id == 0 {
-            self.emit_nil();
-        } else {
-            f()
-        }
-    }
     fn emit_enum_variant_arg(&self, _idx: uint, f: fn()) {
-        f()
+        if _idx != 0 {self.wr.write_char(',');}
+        f();
     }
 
     fn emit_borrowed_vec(&self, _len: uint, f: fn()) {