From 6c98e9f16a6d9ebf11e0a9c8e9ff91b4b320d2af Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 9 Apr 2015 10:06:06 -0700 Subject: [PATCH] Fix phf-macros --- phf_macros/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phf_macros/src/lib.rs b/phf_macros/src/lib.rs index 2ab70971..9c3f886c 100644 --- a/phf_macros/src/lib.rs +++ b/phf_macros/src/lib.rs @@ -159,7 +159,7 @@ fn parse_map(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option> { Key::Str(InternedString::new("")) }); - if !parser.eat(&FatArrow) { + if !parser.eat(&FatArrow).ok().unwrap() { cx.span_err(parser.span, "expected `=>`"); return None; } @@ -172,7 +172,7 @@ fn parse_map(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option> { value: value }); - if !parser.eat(&Comma) && parser.token != Eof { + if !parser.eat(&Comma).ok().unwrap() && parser.token != Eof { cx.span_err(parser.span, "expected `,`"); return None; } @@ -204,7 +204,7 @@ fn parse_set(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option> { value: value.clone(), }); - if !parser.eat(&Comma) && parser.token != Eof { + if !parser.eat(&Comma).ok().unwrap() && parser.token != Eof { cx.span_err(parser.span, "expected `,`"); return None; }