Merge pull request #21 from zsiciarz/master

Update for simplified parser API.
sfackler · Jan 19, 2016 · e7911b8 · e7911b8
2 parents 92fb9fe + 107877b
commit e7911b8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -80,7 +80,7 @@ fn expand_execute(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
 
     let conn = parser.parse_expr().unwrap();
 
-    if !parser.eat(&Comma).ok().unwrap() {
+    if !parser.eat(&Comma) {
         cx.span_err(parser.span, "expected `,`");
         return DummyResult::expr(sp);
     }
@@ -91,7 +91,7 @@ fn expand_execute(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
         None => return DummyResult::expr(sp),
     };
 
-    if parser.token != Eof && !parser.eat(&Comma).ok().unwrap() {
+    if parser.token != Eof && !parser.eat(&Comma) {
         cx.span_err(parser.span, "expected `,`");
         return DummyResult::expr(sp);
     }
@@ -147,7 +147,7 @@ fn parse_args(cx: &mut ExtCtxt, parser: &mut Parser) -> Option<Vec<P<Expr>>> {
     while parser.token != Eof {
         args.push(parser.parse_expr().unwrap());
 
-        if !parser.eat(&Comma).ok().unwrap() && parser.token != Eof {
+        if !parser.eat(&Comma) && parser.token != Eof {
             cx.span_err(parser.span, "expected `,`");
             return None;
         }