diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-07-26 18:36:51 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-07-27 23:41:09 -0700 |
| commit | 2a68c719f4a32123fbd428fe280f41af47d00fea (patch) | |
| tree | a5aaa1c62e6c19672955e417ab534e522a62dd95 /src/libextra | |
| parent | aad53cb6e298192cc75cd5769a1b997a3457666c (diff) | |
| download | rust-2a68c719f4a32123fbd428fe280f41af47d00fea.tar.gz rust-2a68c719f4a32123fbd428fe280f41af47d00fea.zip | |
to_either + fixes
Diffstat (limited to 'src/libextra')
| -rw-r--r-- | src/libextra/json.rs | 19 | ||||
| -rw-r--r-- | src/libextra/time.rs | 8 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/libextra/json.rs b/src/libextra/json.rs index 6a7f0607dd6..4cd67d6ebac 100644 --- a/src/libextra/json.rs +++ b/src/libextra/json.rs @@ -1867,27 +1867,26 @@ mod tests { col: 8u, msg: @~"EOF while parsing object"})); - assert_eq!(result::unwrap(from_str("{}")), mk_object([])); - assert_eq!(result::unwrap(from_str("{\"a\": 3}")), + assert_eq!(from_str("{}").unwrap(), mk_object([])); + assert_eq!(from_str("{\"a\": 3}").unwrap(), mk_object([(~"a", Number(3.0f))])); - assert_eq!(result::unwrap(from_str( - "{ \"a\": null, \"b\" : true }")), + assert_eq!(from_str( + "{ \"a\": null, \"b\" : true }").unwrap(), mk_object([ (~"a", Null), (~"b", Boolean(true))])); - assert_eq!(result::unwrap( - from_str("\n{ \"a\": null, \"b\" : true }\n")), + assert_eq!(from_str("\n{ \"a\": null, \"b\" : true }\n").unwrap(), mk_object([ (~"a", Null), (~"b", Boolean(true))])); - assert_eq!(result::unwrap(from_str( - "{\"a\" : 1.0 ,\"b\": [ true ]}")), + assert_eq!(from_str( + "{\"a\" : 1.0 ,\"b\": [ true ]}").unwrap(), mk_object([ (~"a", Number(1.0)), (~"b", List(~[Boolean(true)])) ])); - assert_eq!(result::unwrap(from_str( + assert_eq!(from_str( ~"{" + "\"a\": 1.0, " + "\"b\": [" + @@ -1895,7 +1894,7 @@ mod tests { "\"foo\\nbar\", " + "{ \"c\": {\"d\": null} } " + "]" + - "}")), + "}").unwrap(), mk_object([ (~"a", Number(1.0f)), (~"b", List(~[ diff --git a/src/libextra/time.rs b/src/libextra/time.rs index b1c07e83f52..f926572dad6 100644 --- a/src/libextra/time.rs +++ b/src/libextra/time.rs @@ -1132,13 +1132,13 @@ mod tests { assert!(test("6", "%w")); assert!(test("2009", "%Y")); assert!(test("09", "%y")); - assert!(result::unwrap(strptime("UTC", "%Z")).tm_zone == + assert!(strptime("UTC", "%Z").unwrap().tm_zone == ~"UTC"); - assert!(result::unwrap(strptime("PST", "%Z")).tm_zone == + assert!(strptime("PST", "%Z").unwrap().tm_zone == ~""); - assert!(result::unwrap(strptime("-0000", "%z")).tm_gmtoff == + assert!(strptime("-0000", "%z").unwrap().tm_gmtoff == 0); - assert!(result::unwrap(strptime("-0800", "%z")).tm_gmtoff == + assert!(strptime("-0800", "%z").unwrap().tm_gmtoff == 0); assert!(test("%", "%%")); |