---

yaml
---
r: 51034
b: refs/heads/try
c: b10b8c3
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: c9188c83015e25978b9c6c4864040dd958bc54b1
+refs/heads/try: b10b8c3ee41447299504127c341bc363d180356c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/json.rs

@@ -1236,6 +1236,8 @@ mod tests {
     use core::prelude::*;
     use core::hashmap::linear::LinearMap;
 
+    use std::serialize::Decodable;
+
     fn mk_object(items: &[(~str, Json)]) -> Json {
         let mut d = ~LinearMap::new();
 
@@ -1389,6 +1391,8 @@ mod tests {
     }
 
     #[auto_encode]
+    #[auto_decode]
+    #[deriving(Eq)]
     enum Animal {
         Dog,
         Frog(~str, int)
@@ -1706,6 +1710,20 @@ mod tests {
                   ]));
     }
 
+    #[test]
+    fn test_read_none() {
+        let decoder = Decoder(from_str(~"null").unwrap());
+        let value: Option<~str> = Decodable::decode(&decoder);
+        assert_eq!(value, None);
+    }
+
+    #[test]
+    fn test_read_some() {
+        let decoder = Decoder(from_str(~"\"jodhpurs\"").unwrap());
+        let value: Option<~str> = Decodable::decode(&decoder);
+        assert_eq!(value, Some(~"jodhpurs"));
+    }
+
     #[test]
     fn test_multiline_errors() {
         assert_eq!(from_str(~"{\n  \"foo\":\n \"bar\""),

branches/try/src/libsyntax/parse/mod.rs

@@ -326,19 +326,30 @@ mod test {
             @~"fn foo (x : int) { x; }",
             ~[],
             new_parse_sess(None));
-        assert_eq!(to_json_str(@tts),
-                    ~"[[\"tt_tok\",[null,[\"IDENT\",[\"fn\",false]]]],\
-                      [\"tt_tok\",[null,[\"IDENT\",[\"foo\",false]]]],\
-                      [\"tt_delim\",[[[\"tt_tok\",[null,[\"LPAREN\",[]]]],\
-                      [\"tt_tok\",[null,[\"IDENT\",[\"x\",false]]]],\
-                      [\"tt_tok\",[null,[\"COLON\",[]]]],\
-                      [\"tt_tok\",[null,[\"IDENT\",[\"int\",false]]]],\
-                      [\"tt_tok\",[null,[\"RPAREN\",[]]]]]]],\
-                      [\"tt_delim\",[[[\"tt_tok\",[null,[\"LBRACE\",[]]]],\
-                      [\"tt_tok\",[null,[\"IDENT\",[\"x\",false]]]],\
-                      [\"tt_tok\",[null,[\"SEMI\",[]]]],\
-                      [\"tt_tok\",[null,[\"RBRACE\",[]]]]]]]]"
-                   );
+        assert_eq!(
+            to_json_str(@tts),
+            ~"[\
+                [\"tt_tok\",[null,[\"IDENT\",[\"fn\",false]]]],\
+                [\"tt_tok\",[null,[\"IDENT\",[\"foo\",false]]]],\
+                [\"tt_delim\",[\
+                    [\
+                        [\"tt_tok\",[null,[\"LPAREN\",[]]]],\
+                        [\"tt_tok\",[null,[\"IDENT\",[\"x\",false]]]],\
+                        [\"tt_tok\",[null,[\"COLON\",[]]]],\
+                        [\"tt_tok\",[null,[\"IDENT\",[\"int\",false]]]],\
+                        [\"tt_tok\",[null,[\"RPAREN\",[]]]]\
+                    ]\
+                ]],\
+                [\"tt_delim\",[\
+                    [\
+                        [\"tt_tok\",[null,[\"LBRACE\",[]]]],\
+                        [\"tt_tok\",[null,[\"IDENT\",[\"x\",false]]]],\
+                        [\"tt_tok\",[null,[\"SEMI\",[]]]],\
+                        [\"tt_tok\",[null,[\"RBRACE\",[]]]]\
+                    ]\
+                ]]\
+            ]"
+        );
         let ast1 = new_parser_from_tts(new_parse_sess(None),~[],tts)
             .parse_item(~[]);
         let ast2 = parse_item_from_source_str(