Merge pull request #69 from nrc/rustup

rustup for phf_macros
rust-phf · Nov 9, 2015 · 8185728 · 8185728
2 parents 58e2223 + 4c51ffc
commit 8185728
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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<Vec<Entry>> {
 
     let mut bad = false;
     while parser.token != Eof {
-        let key = cx.expander().fold_expr(parser.parse_expr());
+        let key = cx.expander().fold_expr(parser.parse_expr_panic());
         let key_contents = parse_key(cx, &*key).unwrap_or_else(|| {
             bad = true;
             Key::Str(InternedString::new(""))
@@ -170,7 +170,7 @@ fn parse_map(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
             return None;
         }
 
-        let value = parser.parse_expr();
+        let value = parser.parse_expr_panic();
 
         entries.push(Entry {
             key_contents: key_contents,
@@ -198,7 +198,7 @@ fn parse_set(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
 
     let mut bad = false;
     while parser.token != Eof {
-        let key = cx.expander().fold_expr(parser.parse_expr());
+        let key = cx.expander().fold_expr(parser.parse_expr_panic());
         let key_contents = parse_key(cx, &*key).unwrap_or_else(|| {
             bad = true;
             Key::Str(InternedString::new(""))