Slightly refactor a bit of macro error handling

Author: madsmtm

crates/objc2/src/macros/declare_class.rs

@@ -1180,33 +1180,6 @@ macro_rules! __convert_result {
 #[doc(hidden)]
 #[macro_export]
 macro_rules! __declare_class_register_out {
-    // #[method(dealloc)]
-    {
-        ($builder:ident)
-        ($($qualifiers:tt)*)
-        ($name:ident)
-        ($($__ret:ty)?)
-        ($__body:block)
-
-        ($builder_method:ident)
-        ($__receiver:expr)
-        ($__receiver_ty:ty)
-        ($($__params_prefix:tt)*)
-        ($($params_rest:tt)*)
-
-        (#[method(dealloc)])
-        ()
-        () // No optional
-        ($($m_checked:tt)*)
-    } => {
-        $crate::__extract_and_apply_cfg_attributes! {
-            @($($m_checked)*)
-            @($crate::__macro_helpers::compile_error!(
-                "`#[method(dealloc)]` is not supported. Implement `Drop` for the type instead"
-            ))
-        }
-    };
-
     // #[method(...)]
     {
         ($builder:ident)
@@ -1223,12 +1196,15 @@ macro_rules! __declare_class_register_out {
 
         (#[method($($sel:tt)*)])
         ()
-        () // No optional
+        ($($m_optional:tt)*)
         ($($m_checked:tt)*)
     } => {
         $crate::__extract_and_apply_cfg_attributes! {
             @($($m_checked)*)
             @(
+                $crate::__declare_class_invalid_selectors!(#[method($($sel)*)]);
+                $crate::__extern_methods_no_optional!($($m_optional)*);
+
                 $builder.$builder_method(
                     $crate::sel!($($sel)*),
                     Self::$name as $crate::__fn_ptr! {
@@ -1257,14 +1233,17 @@ macro_rules! __declare_class_register_out {
 
         (#[method_id($($sel:tt)*)])
         () // Retain semantics unsupported in declare_class!
-        () // No optional
+        ($($m_optional:tt)*)
         ($($m_checked:tt)*)
     } => {
         $crate::__extract_and_apply_cfg_attributes! {
             @($($m_checked)*)
             @(
+                $crate::__declare_class_invalid_selectors!(#[method_id($($sel)*)]);
+                $crate::__extern_methods_no_optional!($($m_optional)*);
+
                 $builder.$builder_method(
-                    $crate::__get_method_id_sel!($($sel)*),
+                    $crate::sel!($($sel)*),
                     Self::$name as $crate::__fn_ptr! {
                         ($($qualifiers)*)
                         (_, _,)
@@ -1274,65 +1253,56 @@ macro_rules! __declare_class_register_out {
             )
         }
     };
-
-    // #[optional]
-    {
-        ($builder:ident)
-        ($($qualifiers:tt)*)
-        ($name:ident)
-        ($($__ret:ty)?)
-        ($__body:block)
-
-        ($builder_method:ident)
-        ($__receiver:expr)
-        ($__receiver_ty:ty)
-        ($($__params_prefix:tt)*)
-        ($($params_rest:tt)*)
-
-        ($($m_method:tt)*)
-        ($($retain_semantics:tt)*)
-        ($($m_optional:tt)*)
-        ($($m_checked:tt)*)
-    } => {
-        $crate::__macro_helpers::compile_error!("`#[optional]` is only supported in `extern_protocol!`")
-    };
 }
 
 #[doc(hidden)]
 #[macro_export]
-macro_rules! __get_method_id_sel {
-    (alloc) => {
+macro_rules! __declare_class_invalid_selectors {
+    (#[method(dealloc)]) => {
+        $crate::__macro_helpers::compile_error!(
+            "`#[method(dealloc)]` is not supported. Implement `Drop` for the type instead"
+        )
+    };
+    (#[method_id(dealloc)]) => {
+        $crate::__macro_helpers::compile_error!(
+            "`#[method_id(dealloc)]` is not supported. Implement `Drop` for the type instead"
+        )
+    };
+    (#[method_id(alloc)]) => {
         $crate::__macro_helpers::compile_error!($crate::__macro_helpers::concat!(
             "`#[method_id(alloc)]` is not supported. ",
             "Use `#[method(alloc)]` and do the memory management yourself",
         ))
     };
-    (retain) => {
+    (#[method_id(retain)]) => {
         $crate::__macro_helpers::compile_error!($crate::__macro_helpers::concat!(
             "`#[method_id(retain)]` is not supported. ",
             "Use `#[method(retain)]` and do the memory management yourself",
         ))
     };
-    (release) => {
+    (#[method_id(release)]) => {
         $crate::__macro_helpers::compile_error!($crate::__macro_helpers::concat!(
             "`#[method_id(release)]` is not supported. ",
             "Use `#[method(release)]` and do the memory management yourself",
         ))
     };
-    (autorelease) => {
+    (#[method_id(autorelease)]) => {
         $crate::__macro_helpers::compile_error!($crate::__macro_helpers::concat!(
             "`#[method_id(autorelease)]` is not supported. ",
             "Use `#[method(autorelease)]` and do the memory management yourself",
         ))
     };
-    (dealloc) => {
-        $crate::__macro_helpers::compile_error!($crate::__macro_helpers::concat!(
-            "`#[method_id(dealloc)]` is not supported. ",
-            "Add an instance variable with a `Drop` impl to the class instead",
-        ))
-    };
-    ($($t:tt)*) => {
-        $crate::sel!($($t)*)
+    (#[$method_or_method_id:ident($($sel:tt)*)]) => {};
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __declare_class_no_optional {
+    () => {};
+    (#[optional]) => {
+        $crate::__macro_helpers::compile_error!(
+            "`#[optional]` is only supported in `extern_protocol!`"
+        )
     };
 }
 

crates/objc2/src/macros/extern_methods.rs

@@ -302,14 +302,16 @@ macro_rules! __extern_methods_method_out {
 
         (#[method($($sel:tt)*)])
         ()
-        () // No `optional`
+        ($($m_optional:tt)*)
         ($($m_checked:tt)*)
     } => {
         $($m_checked)*
         $($function_start)*
         where
             $($where : $bound,)*
         {
+            $crate::__extern_methods_no_optional!($($m_optional)*);
+
             #[allow(unused_unsafe)]
             unsafe {
                 $crate::__method_msg_send! {
@@ -337,14 +339,16 @@ macro_rules! __extern_methods_method_out {
 
         (#[method_id($($sel:tt)*)])
         ($($retain_semantics:tt)*)
-        () // No `optional`
+        ($($m_optional:tt)*)
         ($($m_checked:tt)*)
     } => {
         $($m_checked)*
         $($function_start)*
         where
             $($where : $bound,)*
         {
+            $crate::__extern_methods_no_optional!($($m_optional)*);
+
             #[allow(unused_unsafe)]
             unsafe {
                 $crate::__method_msg_send_id! {
@@ -359,26 +363,15 @@ macro_rules! __extern_methods_method_out {
             }
         }
     };
+}
 
-    // #[optional]
-    {
-        ($($function_start:tt)*)
-        ($($where:ty : $bound:path ,)*)
-
-        ($__builder_method:ident)
-        ($receiver:expr)
-        ($__receiver_ty:ty)
-        ($($__params_prefix:tt)*)
-        ($($params_rest:tt)*)
-
-        ($($m_method:tt)*)
-        ($($retain_semantics:tt)*)
-        ($($m_optional:tt)*)
-        ($($m_checked:tt)*)
-    } => {
-        $($m_checked)*
-        $($function_start)* {
-            $crate::__macro_helpers::compile_error!("`#[optional]` is only supported in `extern_protocol!`")
-        }
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __extern_methods_no_optional {
+    () => {};
+    (#[optional]) => {
+        $crate::__macro_helpers::compile_error!(
+            "`#[optional]` is only supported in `extern_protocol!`"
+        )
     };
 }

crates/test-ui/ui/declare_class_invalid_syntax.stderr

@@ -136,7 +136,7 @@ error: `#[method_id(alloc)]` is not supported. Use `#[method(alloc)]` and do the
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__get_method_id_sel` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__declare_class_invalid_selectors` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[method_id(retain)]` is not supported. Use `#[method(retain)]` and do the memory management yourself
  --> ui/declare_class_invalid_syntax.rs
@@ -150,7 +150,7 @@ error: `#[method_id(retain)]` is not supported. Use `#[method(retain)]` and do t
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__get_method_id_sel` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__declare_class_invalid_selectors` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[method_id(release)]` is not supported. Use `#[method(release)]` and do the memory management yourself
  --> ui/declare_class_invalid_syntax.rs
@@ -164,7 +164,7 @@ error: `#[method_id(release)]` is not supported. Use `#[method(release)]` and do
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__get_method_id_sel` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__declare_class_invalid_selectors` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[method_id(autorelease)]` is not supported. Use `#[method(autorelease)]` and do the memory management yourself
  --> ui/declare_class_invalid_syntax.rs
@@ -178,9 +178,9 @@ error: `#[method_id(autorelease)]` is not supported. Use `#[method(autorelease)]
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__get_method_id_sel` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__declare_class_invalid_selectors` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: `#[method_id(dealloc)]` is not supported. Add an instance variable with a `Drop` impl to the class instead
+error: `#[method_id(dealloc)]` is not supported. Implement `Drop` for the type instead
  --> ui/declare_class_invalid_syntax.rs
   |
   | / declare_class!(
@@ -192,7 +192,7 @@ error: `#[method_id(dealloc)]` is not supported. Add an instance variable with a
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__get_method_id_sel` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__declare_class_invalid_selectors` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[method(dealloc)]` is not supported. Implement `Drop` for the type instead
  --> ui/declare_class_invalid_syntax.rs
@@ -206,7 +206,7 @@ error: `#[method(dealloc)]` is not supported. Implement `Drop` for the type inst
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__declare_class_register_out` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__declare_class_invalid_selectors` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: an inner attribute is not permitted in this context
  --> ui/declare_class_invalid_syntax.rs

crates/test-ui/ui/wrong_optional.stderr

@@ -10,7 +10,7 @@ error: `#[optional]` is only supported in `extern_protocol!`
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__extern_methods_method_out` which comes from the expansion of the macro `extern_methods` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__extern_methods_no_optional` which comes from the expansion of the macro `extern_methods` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[optional]` is only supported in `extern_protocol!`
  --> ui/wrong_optional.rs
@@ -24,7 +24,7 @@ error: `#[optional]` is only supported in `extern_protocol!`
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__extern_methods_method_out` which comes from the expansion of the macro `extern_methods` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__extern_methods_no_optional` which comes from the expansion of the macro `extern_methods` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[optional]` is only supported in `extern_protocol!`
  --> ui/wrong_optional.rs
@@ -38,7 +38,7 @@ error: `#[optional]` is only supported in `extern_protocol!`
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__declare_class_register_out` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__extern_methods_no_optional` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[optional]` is only supported in `extern_protocol!`
  --> ui/wrong_optional.rs
@@ -52,4 +52,4 @@ error: `#[optional]` is only supported in `extern_protocol!`
   | | );
   | |_^
   |
-  = note: this error originates in the macro `$crate::__declare_class_register_out` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `$crate::__extern_methods_no_optional` which comes from the expansion of the macro `declare_class` (in Nightly builds, run with -Z macro-backtrace for more info)