Combine generate_to_tokens and ast_enum_of_structs_impl

dtolnay · May 15, 2024 · fa5fb53 · fa5fb53
1 parent 7ab886f
commit fa5fb53
Showing 1 changed file with 5 additions and 22 deletions.
diff --git a/src/macros.rs b/src/macros.rs
@@ -60,26 +60,8 @@ macro_rules! ast_enum_of_structs {
 
         $(#[$enum_attr])* $pub $enum $name $body
 
-        ast_enum_of_structs_impl!($name $body);
-
         #[cfg(feature = "printing")]
-        generate_to_tokens!(() tokens $name $body);
-    };
-}
-
-macro_rules! ast_enum_of_structs_impl {
-    (
-        $name:ident {
-            $(
-                $(#[cfg $cfg_attr:tt])*
-                $(#[doc $($doc_attr:tt)*])*
-                $variant:ident $( ($member:ident) )*,
-            )*
-        }
-    ) => {
-        $($(
-            ast_enum_from_struct!($name::$variant, $member);
-        )*)*
+        ast_enum_of_structs_impl!(() tokens $name $body);
     };
 }
 
@@ -97,7 +79,7 @@ macro_rules! ast_enum_from_struct {
 }
 
 #[cfg(feature = "printing")]
-macro_rules! generate_to_tokens {
+macro_rules! ast_enum_of_structs_impl {
     (
         ($($arms:tt)*) $tokens:ident $name:ident {
             $(#[cfg $cfg_attr:tt])*
@@ -106,7 +88,7 @@ macro_rules! generate_to_tokens {
             $($next:tt)*
         }
     ) => {
-        generate_to_tokens!(
+        ast_enum_of_structs_impl!(
             ($($arms)* $(#[cfg $cfg_attr])* $name::$variant => {})
             $tokens $name { $($next)* }
         );
@@ -120,7 +102,8 @@ macro_rules! generate_to_tokens {
             $($next:tt)*
         }
     ) => {
-        generate_to_tokens!(
+        ast_enum_from_struct!($name::$variant, $member);
+        ast_enum_of_structs_impl!(
             ($($arms)* $(#[cfg $cfg_attr])* $name::$variant(_e) => _e.to_tokens($tokens),)
             $tokens $name { $($next)* }
         );