Parse unnamed struct/union syntax

dtolnay · Sep 3, 2023 · 00a8bef · 00a8bef
1 parent face31f
commit 00a8bef
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/src/data.rs b/src/data.rs
@@ -214,17 +214,37 @@ pub(crate) mod parsing {
         /// Parses a named (braced struct) field.
         #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
         pub fn parse_named(input: ParseStream) -> Result<Self> {
+            let attrs = input.call(Attribute::parse_outer)?;
+            let vis: Visibility = input.parse()?;
+
+            let unnamed_field = cfg!(feature = "full") && input.peek(Token![_]);
+            let ident = if unnamed_field {
+                input.call(Ident::parse_any)
+            } else {
+                input.parse()
+            }?;
+
+            let colon_token: Token![:] = input.parse()?;
+
+            let ty: Type = if unnamed_field
+                && (input.peek(Token![struct])
+                    || input.peek(Token![union]) && input.peek2(token::Brace))
+            {
+                let begin = input.fork();
+                input.parse::<Ident>()?;
+                input.parse::<FieldsNamed>()?;
+                Type::Verbatim(verbatim::between(&begin, input))
+            } else {
+                input.parse()?
+            };
+
             Ok(Field {
-                attrs: input.call(Attribute::parse_outer)?,
-                vis: input.parse()?,
+                attrs,
+                vis,
                 mutability: FieldMutability::None,
-                ident: Some(if input.peek(Token![_]) {
-                    input.call(Ident::parse_any)
-                } else {
-                    input.parse()
-                }?),
-                colon_token: Some(input.parse()?),
-                ty: input.parse()?,
+                ident: Some(ident),
+                colon_token: Some(colon_token),
+                ty,
             })
         }
 

diff --git a/tests/repo/mod.rs b/tests/repo/mod.rs
@@ -17,10 +17,6 @@ const REVISION: &str = "9f5fc1bd443f59583e7af0d94d289f95fe1e20c4";
 
 #[rustfmt::skip]
 static EXCLUDE_FILES: &[&str] = &[
-    // TODO: anonymous union and struct
-    // https://github.com/dtolnay/syn/issues/1049
-    "src/tools/rustfmt/tests/target/anonymous-types.rs",
-
     // TODO: generic const items
     // https://github.com/dtolnay/syn/issues/1497
     "tests/rustdoc/generic-const-items.rs",