Merge pull request #109 from dtolnay/keyword

Fix keyword as fmt argument
dtolnay · Nov 4, 2020 · 53bb2fb · 53bb2fb
2 parents 7a9066f + aafcf0a
commit 53bb2fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/impl/src/fmt.rs b/impl/src/fmt.rs
@@ -102,7 +102,7 @@ fn explicit_named_args(input: ParseStream) -> Result<Set<Ident>> {
     while !input.is_empty() {
         if input.peek(Token![,]) && input.peek2(Ident::peek_any) && input.peek3(Token![=]) {
             input.parse::<Token![,]>()?;
-            let ident: Ident = input.parse()?;
+            let ident = input.call(Ident::parse_any)?;
             input.parse::<Token![=]>()?;
             named_args.insert(ident);
         } else {
@@ -143,5 +143,5 @@ fn take_ident(read: &mut &str) -> Ident {
             }
         }
     }
-    syn::parse_str(&ident).unwrap()
+    Ident::parse_any.parse_str(&ident).unwrap()
 }
diff --git a/tests/test_display.rs b/tests/test_display.rs
@@ -263,3 +263,12 @@ fn test_raw_conflict() {
 
     assert("braced raw error: T, U", Error::Braced { r#func: "T" });
 }
+
+#[test]
+fn test_keyword() {
+    #[derive(Error, Debug)]
+    #[error("error: {type}", type = 1)]
+    struct Error;
+
+    assert("error: 1", Error);
+}