Merge pull request #16 from zsiciarz/master

Update for rustc 1.0.0-nightly (6b95d8bed 2015-04-09) (built 2015-04-10)

Author: tomjakubowski

src/plugin.rs

@@ -34,11 +34,11 @@ fn parse_json(cx: &ExtCtxt, parser: &mut Parser) -> P<Expr> {
 
     match &parser.token {
         &Token::OpenDelim(DelimToken::Bracket) => {
-            parser.bump();
+            let _ = parser.bump();
             let r_bracket = Token::CloseDelim(DelimToken::Bracket);
             let exprs = parser.parse_seq_to_end(&r_bracket, comma_sep!(), |p| {
-                parse_json(cx, p)
-            });
+                Ok(parse_json(cx, p))
+            }).ok().unwrap();
             let exprs = cx.expr_vec(orig_span, exprs);
             quote_expr!(cx, {{
                 use ::std::boxed::Box;
@@ -47,18 +47,18 @@ fn parse_json(cx: &ExtCtxt, parser: &mut Parser) -> P<Expr> {
             }})
         },
         &Token::OpenDelim(DelimToken::Brace) => {
-            parser.bump();
+            let _ = parser.bump();
             let r_brace = Token::CloseDelim(DelimToken::Brace);
             let kvs = parser.parse_seq_to_end(&r_brace, comma_sep!(), |p| {
-                let (istr, _) = p.parse_str();
+                let (istr, _) = p.parse_str().ok().unwrap();
                 let s = &*istr;
-                p.expect(&Token::Colon);
+                let _ = p.expect(&Token::Colon);
                 let key = quote_expr!(cx, {{
                     use ::std::borrow::ToOwned;
                     $s.to_owned()
                 }});
-                (key, parse_json(cx, p))
-            });
+                Ok((key, parse_json(cx, p)))
+            }).ok().unwrap();
             let ob = quote_expr!(cx, _ob);
             let mut stmts = vec![];
             for &(ref key, ref value) in kvs.iter() {
@@ -78,11 +78,11 @@ fn parse_json(cx: &ExtCtxt, parser: &mut Parser) -> P<Expr> {
             }})
         },
         &Token::Ident(id, IdentStyle::Plain) if id.as_str() == "null" => {
-            parser.bump();
+            let _ = parser.bump();
             quote_expr!(cx, { ::rustc_serialize::json::Json::Null })
         },
         _ => { // TODO: investigate can_begin_expr (maybe eliminate need for parens)?
-            let expr = parser.parse_literal_maybe_minus();
+            let expr = parser.parse_literal_maybe_minus().ok().unwrap();
             quote_expr!(cx, {{
                 use ::rustc_serialize::json::ToJson;
                 ($expr).to_json()