Polish actions macros

Nathan Sobo created 2 years ago

Change summary

crates/gpui2/src/action.rs        |  3 +--
crates/gpui2_macros/src/action.rs | 20 ++++++++++++++------
crates/menu2/src/menu2.rs         |  5 +++--
crates/zed2/src/main.rs           |  2 +-
4 files changed, 19 insertions(+), 11 deletions(-)

Detailed changes

crates/gpui2/src/action.rs

@@ -145,8 +145,7 @@ macro_rules! actions {
     () => {};
 
     ( $name:ident ) => {
-        #[gpui::register_action]
-        #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug, ::std::cmp::PartialEq, $crate::serde::Deserialize)]
+        #[gpui::action]
         pub struct $name;
     };
 

crates/gpui2_macros/src/action.rs

@@ -34,13 +34,21 @@ pub fn action(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let visibility = input.vis;
 
     let output = match input.data {
-        syn::Data::Struct(ref struct_data) => {
-            let fields = &struct_data.fields;
-            quote! {
-                #attributes
-                #visibility struct #name #fields
+        syn::Data::Struct(ref struct_data) => match &struct_data.fields {
+            syn::Fields::Named(_) | syn::Fields::Unnamed(_) => {
+                let fields = &struct_data.fields;
+                quote! {
+                    #attributes
+                    #visibility struct #name #fields
+                }
             }
-        }
+            syn::Fields::Unit => {
+                quote! {
+                    #attributes
+                    #visibility struct #name;
+                }
+            }
+        },
         syn::Data::Enum(ref enum_data) => {
             let variants = &enum_data.variants;
             quote! {

crates/menu2/src/menu2.rs

@@ -1,9 +1,10 @@
 use gpui::actions;
 
-// todo!(remove this)
+// If the zed binary doesn't use anything in this crate, it will be optimized out
+// and the actions won't initialize. So we just call an empty initialization function.
 // https://github.com/rust-lang/rust/issues/47384
 // https://github.com/mmastrac/rust-ctor/issues/280
-pub fn unused() {}
+pub fn init() {}
 
 actions!(
     Cancel,

crates/zed2/src/main.rs

@@ -59,7 +59,7 @@ fn main() {
     //TODO!(figure out what the linker issues are here)
     // https://github.com/rust-lang/rust/issues/47384
     // https://github.com/mmastrac/rust-ctor/issues/280
-    menu::unused();
+    // menu::unused();
     let http = http::client();
     init_paths();
     init_logger();