commit 570695ea9345d9db9e089a9e21f2b157dffa6fb3
author David Tolnay <dtolnay@gmail.com> Sat Jun 03 16:15:13 2017 -0700
committer David Tolnay <dtolnay@gmail.com> Sat Jun 03 18:50:41 2017 -0700
tree b83cc27c5093c6ce7eb40675bd2c8e0e38027b84
parent 37ea608ccf15d7be169caa4f23c8639abd7961d7

Require Ident to contain a valid ident

src/expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index fff9c52..f64bc31 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -1253,11 +1253,11 @@
     impl Synom for FieldValue {
         named!(parse -> Self, alt!(
             do_parse!(
-                name: wordlike >>
+                ident: field_ident >>
                 colon: syn!(Colon) >>
                 value: syn!(Expr) >>
                 (FieldValue {
-                    ident: name,
+                    ident: ident,
                     expr: value,
                     is_shorthand: false,
                     attrs: Vec::new(),
@@ -1413,6 +1413,7 @@
             Mac {
                 path: what,
                 bang_token: bang,
+                ident: None,
                 tokens: vec![TokenTree(proc_macro2::TokenTree {
                     span: ((data.1).0).0,
                     kind: TokenKind::Sequence(Delimiter::Brace, data.0),
@@ -1582,7 +1583,7 @@
     impl Synom for FieldPat {
         named!(parse -> Self, alt!(
             do_parse!(
-                ident: wordlike >>
+                ident: field_ident >>
                 colon: syn!(Colon) >>
                 pat: syn!(Pat) >>
                 (FieldPat {
@@ -1628,14 +1629,14 @@
         ));
     }
 
-    named!(wordlike -> Ident, alt!(
+    named!(field_ident -> Ident, alt!(
         syn!(Ident)
         |
         do_parse!(
             lit: syn!(Lit) >>
             ({
-                let s = lit.value.to_string();
-                if s.parse::<u32>().is_ok() {
+                let s = lit.to_string();
+                if s.parse::<usize>().is_ok() {
                     Ident::new(s.into(), lit.span)
                 } else {
                     return parse_error();