Allow anonymous enums to be formatted

madsmtm · Jan 14, 2023 · d74e1c5 · d74e1c5
1 parent 1c75f1a
commit d74e1c5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/crates/header-translator/src/stmt.rs b/crates/header-translator/src/stmt.rs
@@ -1199,11 +1199,11 @@ impl fmt::Display for Stmt {
                 writeln!(f, "{macro_name}!(")?;
                 writeln!(f, "    #[underlying({ty})]")?;
                 write!(f, "{availability}")?;
-                write!(f, "    pub enum ",)?;
-                if let Some(name) = &id.name {
-                    write!(f, "{name} ")?;
-                }
-                writeln!(f, "{{")?;
+                writeln!(
+                    f,
+                    "    pub enum {} {{",
+                    id.name.as_deref().unwrap_or("__anonymous__")
+                )?;
                 for (name, availability, expr) in variants {
                     write!(f, "{availability}")?;
                     writeln!(f, "        {name} = {expr},")?;

diff --git a/crates/icrate/src/generated b/crates/icrate/src/generated
diff --git a/crates/icrate/src/macros.rs b/crates/icrate/src/macros.rs
@@ -40,21 +40,17 @@ macro_rules! extern_enum {
     (
         #[underlying($ty:ty)]
         $(#[$m:meta])*
-        $v:vis enum $name:ident {
+        $v:vis enum __anonymous__ {
             $(
                 $(#[$field_m:meta])*
                 $field:ident = $value:expr
             ),* $(,)?
         }
     ) => {
-        // TODO: Improve type-safety
-        $(#[$m])*
-        $v type $name = $ty;
-
         extern_enum! {
             @__inner
             @($v)
-            @($name)
+            @($ty)
             @($(
                 $(#[$field_m])*
                 $field = $value,
@@ -64,17 +60,21 @@ macro_rules! extern_enum {
     (
         #[underlying($ty:ty)]
         $(#[$m:meta])*
-        $v:vis enum {
+        $v:vis enum $name:ident {
             $(
                 $(#[$field_m:meta])*
                 $field:ident = $value:expr
             ),* $(,)?
         }
     ) => {
+        // TODO: Improve type-safety
+        $(#[$m])*
+        $v type $name = $ty;
+
         extern_enum! {
             @__inner
             @($v)
-            @($ty)
+            @($name)
             @($(
                 $(#[$field_m])*
                 $field = $value,