Skip to content

Commit 402c15f

Browse files
committed
---
yaml --- r: 30200 b: refs/heads/incoming c: 11871b8 h: refs/heads/master v: v3
1 parent 3766a5e commit 402c15f

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 54a8d69c4feb878e0367cc55772c04ee2d59c8a5
9+
refs/heads/incoming: 11871b8baa3c866cb9a58fba83d6f78a05a13c10
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/json.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -703,20 +703,18 @@ mod tests {
703703
assert to_str(mk_dict(~[])) == ~"{}";
704704
assert to_str(mk_dict(~[(~"a", Boolean(true))]))
705705
== ~"{ \"a\": true }";
706-
assert to_str(mk_dict(~[
706+
let a = mk_dict(~[
707707
(~"a", Boolean(true)),
708708
(~"b", List(@~[
709709
mk_dict(~[(~"c", String(@~"\x0c\r"))]),
710710
mk_dict(~[(~"d", String(@~""))])
711711
]))
712-
])) ==
713-
~"{ " +
714-
~"\"a\": true, " +
715-
~"\"b\": [" +
716-
~"{ \"c\": \"\\f\\r\" }, " +
717-
~"{ \"d\": \"\" }" +
718-
~"]" +
719-
~" }";
712+
]);
713+
let astr = to_str(a);
714+
let b = result::get(from_str(astr));
715+
let bstr = to_str(b);
716+
assert astr == bstr;
717+
assert a == b;
720718
}
721719

722720
#[test]

0 commit comments

Comments
 (0)