Rustup

sfackler · Nov 23, 2015 · a6c43fa25e06684121df6a93b2b90405d8e0fc2e · a6c43fa
1 parent 1ce4e9f
commit a6c43fa25e06684121df6a93b2b90405d8e0fc2e
Unified Split

Showing with 3 additions and 3 deletions.

+3 −3 phf_macros/src/lib.rs
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_panic());
+  
+        let key = cx.expander().fold_expr(parser.parse_expr().unwrap());
        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_panic();
+  
+        let value = parser.parse_expr().unwrap();
        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_panic());
+  
+        let key = cx.expander().fold_expr(parser.parse_expr().unwrap());
        let key_contents = parse_key(cx, &*key).unwrap_or_else(|| {
            bad = true;
            Key::Str(InternedString::new(""))