---

yaml
---
r: 30218
b: refs/heads/incoming
c: cf38618
h: refs/heads/master
v: v3

Author: killerswan

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 4fb675be2f42a828fb5a6570b9aad2c65f4598b9
+refs/heads/incoming: cf386188c88c39902d4ef7f9a6be20379e288f5f
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/json.rs

@@ -102,14 +102,20 @@ fn to_writer_pretty(wr: io::Writer, j: Json, indent: uint) {
       String(s) => wr.write_str(escape_str(*s)),
       Boolean(b) => wr.write_str(if b { ~"true" } else { ~"false" }),
       List(vv) => {
+        if vv.len() == 0u {
+            wr.write_str(~"[]");
+            return;
+        }
+
+        let inner_indent = indent + 2;
+
         // [
-        wr.write_str(spaces(indent));
-        wr.write_str("[ ");
+        wr.write_str("[\n");
+        wr.write_str(spaces(inner_indent));
 
         // [ elem,
         //   elem,
         //   elem ]
-        let inner_indent = indent + 2;
         let mut first = true;
         for (*vv).each |item| {
             if !first {
@@ -121,9 +127,18 @@ fn to_writer_pretty(wr: io::Writer, j: Json, indent: uint) {
         };
 
         // ]
-        wr.write_str(~" ]");
+        wr.write_str("\n");
+        wr.write_str(spaces(indent));
+        wr.write_str(~"]");
       }
       Dict(dd) => {
+        if dd.size() == 0u {
+            wr.write_str(~"{}");
+            return;
+        }
+
+        let inner_indent = indent + 2;
+
         // convert from a dictionary
         let mut pairs = ~[];
         for dd.each |key, value| {
@@ -134,13 +149,12 @@ fn to_writer_pretty(wr: io::Writer, j: Json, indent: uint) {
         let sorted_pairs = sort::merge_sort(|a,b| *a <= *b, pairs);
 
         // {
-        wr.write_str(spaces(indent));
-        wr.write_str(~"{ ");
+        wr.write_str(~"{\n");
+        wr.write_str(spaces(inner_indent));
 
         // { k: v,
         //   k: v,
         //   k: v }
-        let inner_indent = indent + 2;
         let mut first = true;
         for sorted_pairs.each |kv| {
             let (key, value) = kv;
@@ -150,13 +164,15 @@ fn to_writer_pretty(wr: io::Writer, j: Json, indent: uint) {
             }
             first = false;
             let key = str::append(escape_str(key), ~": ");
-            let key_indent = str::len(key);
+            let key_indent = inner_indent + str::len(key);
             wr.write_str(key);
             to_writer_pretty(wr, value, key_indent);
         };
 
         // }
-        wr.write_str(~" }");
+        wr.write_str(~"\n");
+        wr.write_str(spaces(indent));
+        wr.write_str(~"}");
       }
       Null => wr.write_str(~"null")
     }
@@ -892,6 +908,12 @@ mod tests {
         assert from_str(~" \"foo\" ") == Ok(String(@~"foo"));
     }
 
+    #[test]
+    fn test_unicode_hex_escapes_in_str() {
+        assert from_str(~"\"\\u12ab\"") == Ok(String(@~"\u12ab"));
+        assert from_str(~"\"\\uAB12\"") == Ok(String(@~"\uAB12"));
+    }
+
     #[test]
     fn test_read_list() {
         assert from_str(~"[") ==