Rollup merge of 21662 - oli-obk:hashmap_enum_json, r=alexcrichton

2015-01-29 03:15:51 +05:30
parent 518ce538a9 82b0b0fcc7
commit 62b24c3dd5
5 changed files with 29 additions and 13 deletions
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -854,7 +854,7 @@ mod test {
    #[test]
    fn string_to_tts_1 () {
        let tts = string_to_tts("fn a (b : i32) { b; }".to_string());
-        assert_eq!(json::encode(&tts),
+        assert_eq!(json::encode(&tts).unwrap(),
        "[\
    {\
        \"variant\":\"TtToken\",\