Merge pull request #376 from dtolnay/check

Check invalid Named member references before producing MemberUnraw

impl/src/fmt.rs

@@ -73,19 +73,25 @@ impl Display<'_> {
                     if read.starts_with("r#") {
                         continue;
                     }
-                    let ident = Ident::new(take_ident(&mut read), span);
+                    let repr = take_ident(&mut read);
-                    MemberUnraw::Named(IdentUnraw::new(ident))
+                    if repr == "_" {
+                        // Invalid. Let rustc produce the diagnostic.
+                        out += repr;
+                        continue;
+                    }
+                    let ident = IdentUnraw::new(Ident::new(repr, span));
+                    if user_named_args.contains(&ident) {
+                        // Refers to a named argument written by the user, not to field.
+                        out += repr;
+                        continue;
+                    }
+                    MemberUnraw::Named(ident)
                 }
                 _ => continue,
             };
             let mut formatvar = match &member {
                 MemberUnraw::Unnamed(index) => IdentUnraw::new(format_ident!("__field{}", index)),
                 MemberUnraw::Named(ident) => {
-                    if user_named_args.contains(ident) || ident == "_" {
-                        // Refers to a named argument written by the user, not to field.
-                        out += &ident.to_string();
-                        continue;
-                    }
                     IdentUnraw::new(format_ident!("__field_{}", ident.to_string()))
                 }
             };