Merge pull request #74 from djudd/fix-eat-retval

Update for changed return value of parser.eat
rust-phf · Jan 13, 2016 · 4791e96 · 4791e96
2 parents 771e781 + 82da9f0
commit 4791e96
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/phf_macros/src/lib.rs b/phf_macros/src/lib.rs
@@ -167,7 +167,7 @@ fn parse_map(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
             Key::Str(InternedString::new(""))
         });
 
-        if !parser.eat(&FatArrow).ok().unwrap() {
+        if !parser.eat(&FatArrow) {
             cx.span_err(parser.span, "expected `=>`");
             return None;
         }
@@ -180,7 +180,7 @@ fn parse_map(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
             value: value,
         });
 
-        if !parser.eat(&Comma).ok().unwrap() && parser.token != Eof {
+        if !parser.eat(&Comma) && parser.token != Eof {
             cx.span_err(parser.span, "expected `,`");
             return None;
         }
@@ -212,7 +212,7 @@ fn parse_set(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
             value: value.clone(),
         });
 
-        if !parser.eat(&Comma).ok().unwrap() && parser.token != Eof {
+        if !parser.eat(&Comma) && parser.token != Eof {
             cx.span_err(parser.span, "expected `,`");
             return None;
         }