Always use proper macro imports, even in error conditions

Author: madsmtm

crates/objc2/src/macros/__attribute_helpers.rs

@@ -115,7 +115,7 @@ macro_rules! __extract_custom_attributes_inner {
         ($out_macro:path)
         $($macro_args:tt)*
     } => {
-        compile_error!("must specify the desired selector using `#[method(...)]` or `#[method_id(...)]`");
+        $crate::__macro_helpers::compile_error!("must specify the desired selector using `#[method(...)]` or `#[method_id(...)]`");
     };
 
     // Base case
@@ -183,7 +183,7 @@ macro_rules! __extract_custom_attributes_inner {
         ($out_macro:path)
         $($macro_args:tt)*
     } => {
-        compile_error!("cannot specify the `method`/`method_id` attribute twice");
+        $crate::__macro_helpers::compile_error!("cannot specify the `method`/`method_id` attribute twice");
     };
 
     // `method_id` attribute with retain semantics
@@ -254,7 +254,7 @@ macro_rules! __extract_custom_attributes_inner {
         ($out_macro:path)
         $($macro_args:tt)*
     } => {
-        compile_error!("cannot specify the `method`/`method_id` attribute twice");
+        $crate::__macro_helpers::compile_error!("cannot specify the `method`/`method_id` attribute twice");
     };
 
     // `optional` attribute
@@ -298,7 +298,7 @@ macro_rules! __extract_custom_attributes_inner {
         ($out_macro:path)
         $($macro_args:tt)*
     } => {
-        compile_error!("cannot specify the `optional` attribute twice");
+        $crate::__macro_helpers::compile_error!("cannot specify the `optional` attribute twice");
     };
 
     // Other attributes

crates/objc2/src/macros/__msg_send_parse.rs

@@ -90,9 +90,9 @@ macro_rules! __msg_send_parse {
         $crate::__comma_between_args!(
             @($(
                 ", ",
-                stringify!($selector),
+                $crate::__macro_helpers::stringify!($selector),
                 ": ",
-                stringify!($argument),
+                $crate::__macro_helpers::stringify!($argument),
             )+)
             $($macro_args)*
         );
@@ -124,7 +124,7 @@ macro_rules! __comma_between_args {
         @($($args:tt)*)
         @($macro_name:literal)
     ) => {
-        #[deprecated = concat!(
+        #[deprecated = $crate::__macro_helpers::concat!(
             "using ", $macro_name, "! without a comma between arguments is ",
             "technically not valid macro syntax, and may break in a future ",
             "version of Rust. You should use the following instead:\n",
@@ -141,7 +141,7 @@ macro_rules! __comma_between_args {
     ) => {
         $crate::__comma_between_args! {
             @__output
-            @(stringify!(super($obj)), $($args)*)
+            @($crate::__macro_helpers::stringify!(super($obj)), $($args)*)
             @("msg_send")
         }
     };
@@ -152,7 +152,7 @@ macro_rules! __comma_between_args {
     ) => {
         $crate::__comma_between_args! {
             @__output
-            @(stringify!(super($obj, $superclass)), $($args)*)
+            @($crate::__macro_helpers::stringify!(super($obj, $superclass)), $($args)*)
             @("msg_send")
         }
     };
@@ -163,7 +163,7 @@ macro_rules! __comma_between_args {
     ) => {
         $crate::__comma_between_args! {
             @__output
-            @(stringify!($obj), $($args)*)
+            @($crate::__macro_helpers::stringify!($obj), $($args)*)
             @("msg_send")
         }
     };
@@ -176,7 +176,7 @@ macro_rules! __comma_between_args {
     ) => {
         $crate::__comma_between_args! {
             @__output
-            @(stringify!($obj), $($args)*)
+            @($crate::__macro_helpers::stringify!($obj), $($args)*)
             @("msg_send_id")
         }
     };

crates/objc2/src/macros/declare_class.rs

@@ -1159,7 +1159,7 @@ macro_rules! __declare_class_method_out_inner {
     } => {
         $($m_checked)*
         $($qualifiers)* extern "C" fn $name() {
-            compile_error!("`#[method_id(...)]` must have a return type")
+            $crate::__macro_helpers::compile_error!("`#[method_id(...)]` must have a return type")
         }
     };
 }
@@ -1294,39 +1294,39 @@ macro_rules! __declare_class_register_out {
         ($($m_optional:tt)*)
         ($($m_checked:tt)*)
     } => {
-        compile_error!("`#[optional]` is only supported in `extern_protocol!`")
+        $crate::__macro_helpers::compile_error!("`#[optional]` is only supported in `extern_protocol!`")
     };
 }
 
 #[doc(hidden)]
 #[macro_export]
 macro_rules! __get_method_id_sel {
     (alloc) => {
-        compile_error!(concat!(
+        $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) => {
-        compile_error!(concat!(
+        $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) => {
-        compile_error!(concat!(
+        $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) => {
-        compile_error!(concat!(
+        $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) => {
-        compile_error!(concat!(
+        $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",
         ))

crates/objc2/src/macros/extern_methods.rs

@@ -378,7 +378,7 @@ macro_rules! __extern_methods_method_out {
     } => {
         $($m_checked)*
         $($function_start)* {
-            compile_error!("`#[optional]` is only supported in `extern_protocol!`")
+            $crate::__macro_helpers::compile_error!("`#[optional]` is only supported in `extern_protocol!`")
         }
     };
 }