From 4c51ffc6d63f768dea75cab65ad6cb809bce9bb4 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Mon, 9 Nov 2015 12:50:14 +1300
Subject: [PATCH] rustup for 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 f08a6fe7..e9b40fbd 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<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(""))