Reduce usage of __emit_struct

madsmtm · madsmtm · commit 1a22ac1923a5 · 2023-10-03T16:41:22.000+02:00
diff --git a/crates/objc2/src/macros/extern_class.rs b/crates/objc2/src/macros/extern_class.rs
@@ -338,14 +338,11 @@ macro_rules! __inner_extern_class {
             $(const NAME: &'static str = $name_const:expr;)?
         }
     ) => {
-        $crate::__emit_struct! {
-            ($(#[$m])*)
-            ($v)
-            ($name<$($t_struct $(: $(?$b_sized_struct)? $($b_struct)? $(= $default)?)?),*>)
-            (
-                $superclass_field: $superclass_field_ty,
-                $($fields)*
-            )
+        $(#[$m])*
+        #[repr(C)]
+        $v struct $name<$($t_struct $(: $(?$b_sized_struct)? $($b_struct)? $(= $default)?)?),*> {
+            $superclass_field: $superclass_field_ty,
+            $($fields)*
         }
 
         $crate::__extern_class_impl_traits! {
diff --git a/crates/objc2/src/runtime/nsobject.rs b/crates/objc2/src/runtime/nsobject.rs
@@ -7,26 +7,21 @@ use crate::runtime::{AnyClass, AnyObject, ProtocolObject};
 use crate::{extern_methods, msg_send, msg_send_id, Message};
 use crate::{ClassType, ProtocolType};
 
-crate::__emit_struct! {
-    (
-        /// The root class of most Objective-C class hierarchies.
-        ///
-        /// This represents the [`NSObject` class][cls]. The name "NSObject" also
-        /// refers to a protocol, see [`NSObjectProtocol`] for that.
-        ///
-        /// Since this class is only available with the `Foundation` framework,
-        /// `objc2` links to it for you.
-        ///
-        /// This is exported under `icrate::Foundation::NSObject`, you probably
-        /// want to use that path instead.
-        ///
-        /// [cls]: https://developer.apple.com/documentation/objectivec/nsobject?language=objc
-    )
-    (pub)
-    (NSObject)
-    (
-        __inner: AnyObject,
-    )
+/// The root class of most Objective-C class hierarchies.
+///
+/// This represents the [`NSObject` class][cls]. The name "NSObject" also
+/// refers to a protocol, see [`NSObjectProtocol`] for that.
+///
+/// Since this class is only available with the `Foundation` framework,
+/// `objc2` links to it for you.
+///
+/// This is exported under `icrate::Foundation::NSObject`, you probably
+/// want to use that path instead.
+///
+/// [cls]: https://developer.apple.com/documentation/objectivec/nsobject?language=objc
+#[repr(C)]
+pub struct NSObject {
+    __inner: AnyObject,
 }
 
 crate::__extern_class_impl_traits! {
diff --git a/crates/objc2/src/runtime/nsproxy.rs b/crates/objc2/src/runtime/nsproxy.rs
@@ -5,20 +5,15 @@ use crate::mutability::Root;
 use crate::runtime::{AnyClass, AnyObject, NSObjectProtocol, ProtocolObject};
 use crate::ClassType;
 
-crate::__emit_struct! {
-    (
-        /// An abstract superclass defining an API for objects that act as
-        /// stand-ins for other objects or for objects that don’t exist yet.
-        ///
-        /// See [Apple's documentation][apple-doc] for more information.
-        ///
-        /// [apple-doc]: https://developer.apple.com/documentation/foundation/nsproxy?language=objc
-    )
-    (pub)
-    (NSProxy)
-    (
-        __inner: AnyObject,
-    )
+/// An abstract superclass defining an API for objects that act as
+/// stand-ins for other objects or for objects that don’t exist yet.
+///
+/// See [Apple's documentation][apple-doc] for more information.
+///
+/// [apple-doc]: https://developer.apple.com/documentation/foundation/nsproxy?language=objc
+#[repr(C)]
+pub struct NSProxy {
+    __inner: AnyObject,
 }
 
 crate::__extern_class_impl_traits! {
diff --git a/crates/test-ui/ui/declare_class_invalid_receiver.stderr b/crates/test-ui/ui/declare_class_invalid_receiver.stderr
@@ -115,11 +115,11 @@ error[E0277]: the trait bound `AnyClass: Message` is not satisfied
   = help: the following other types implement trait `Message`:
             CustomObject
             Exception
+            NSObject
+            __NSProxy
             ProtocolObject<P>
             AnyObject
             __RcTestObject
-            NSObject
-            __NSProxy
 note: required by a bound in `ClassBuilder::add_method`
  --> $WORKSPACE/crates/objc2/src/declare/mod.rs
   |
diff --git a/crates/test-ui/ui/extern_class_root.stderr b/crates/test-ui/ui/extern_class_root.stderr
@@ -12,7 +12,7 @@ error[E0277]: the trait bound `MyObject: ClassType` is not satisfied
   |
   = help: the following other types implement trait `ClassType`:
             MyRootClass
-            __RcTestObject
             NSObject
             __NSProxy
+            __RcTestObject
   = note: this error originates in the macro `$crate::__inner_extern_class` which comes from the expansion of the macro `extern_class` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/crates/test-ui/ui/implement_protocol_missing_super.stderr b/crates/test-ui/ui/implement_protocol_missing_super.stderr
@@ -5,9 +5,9 @@ error[E0277]: the trait bound `CustomObject: NSObjectProtocol` is not satisfied
   |                                           ^^^^^^^^^^^^ the trait `NSObjectProtocol` is not implemented for `CustomObject`
   |
   = help: the following other types implement trait `NSObjectProtocol`:
-            ProtocolObject<T>
             NSObject
             __NSProxy
+            ProtocolObject<T>
             NSApplication
             NSCollectionView
             NSCollectionLayoutSection
diff --git a/crates/test-ui/ui/msg_send_id_invalid_return.stderr b/crates/test-ui/ui/msg_send_id_invalid_return.stderr
@@ -26,11 +26,11 @@ error[E0277]: the trait bound `AnyClass: Message` is not satisfied
   |
   = help: the following other types implement trait `Message`:
             Exception
+            NSObject
+            __NSProxy
             ProtocolObject<P>
             AnyObject
             __RcTestObject
-            NSObject
-            __NSProxy
   = note: required for `RetainSemantics<1>` to implement `MsgSendId<&AnyClass, Option<Id<AnyClass>>>`
 
 error[E0277]: the trait bound `AnyClass: Message` is not satisfied
@@ -44,11 +44,11 @@ error[E0277]: the trait bound `AnyClass: Message` is not satisfied
   |
   = help: the following other types implement trait `Message`:
             Exception
+            NSObject
+            __NSProxy
             ProtocolObject<P>
             AnyObject
             __RcTestObject
-            NSObject
-            __NSProxy
   = note: required for `RetainSemantics<1>` to implement `MsgSendId<&AnyClass, Option<Id<AnyClass>>>`
 
 error[E0277]: the trait bound `&AnyObject: MaybeUnwrap` is not satisfied
@@ -79,11 +79,11 @@ error[E0277]: the trait bound `AnyClass: Message` is not satisfied
   |
   = help: the following other types implement trait `Message`:
             Exception
+            NSObject
+            __NSProxy
             ProtocolObject<P>
             AnyObject
             __RcTestObject
-            NSObject
-            __NSProxy
   = note: required for `RetainSemantics<2>` to implement `MsgSendId<&AnyClass, Allocated<AnyClass>>`
 
 error[E0271]: type mismatch resolving `<Id<AnyObject> as MaybeUnwrap>::Input == Allocated<_>`
diff --git a/crates/test-ui/ui/msg_send_invalid_error.stderr b/crates/test-ui/ui/msg_send_invalid_error.stderr
@@ -36,11 +36,11 @@ error[E0277]: the trait bound `i32: Message` is not satisfied
   |
   = help: the following other types implement trait `Message`:
             Exception
+            NSObject
+            __NSProxy
             ProtocolObject<P>
             AnyObject
             __RcTestObject
-            NSObject
-            __NSProxy
             NSApplication
             NSCollectionView
           and $N others
diff --git a/crates/test-ui/ui/msg_send_super_not_classtype.stderr b/crates/test-ui/ui/msg_send_super_not_classtype.stderr
@@ -8,9 +8,9 @@ error[E0277]: the trait bound `AnyObject: ClassType` is not satisfied
   |                          required by a bound introduced by this call
   |
   = help: the following other types implement trait `ClassType`:
-            __RcTestObject
             NSObject
             __NSProxy
+            __RcTestObject
 note: required by a bound in `send_super_message_static`
  --> $WORKSPACE/crates/objc2/src/__macro_helpers/msg_send.rs
   |
@@ -30,9 +30,9 @@ error[E0277]: the trait bound `AnyObject: ClassType` is not satisfied
   |                          required by a bound introduced by this call
   |
   = help: the following other types implement trait `ClassType`:
-            __RcTestObject
             NSObject
             __NSProxy
+            __RcTestObject
 note: required by a bound in `send_super_message_static`
  --> $WORKSPACE/crates/objc2/src/__macro_helpers/msg_send.rs
   |
diff --git a/crates/test-ui/ui/mutability_traits_unimplementable2.stderr b/crates/test-ui/ui/mutability_traits_unimplementable2.stderr
@@ -5,9 +5,9 @@ error[E0277]: the trait bound `CustomStruct: ClassType` is not satisfied
   |                                           ^^^^^^^^^^^^ the trait `ClassType` is not implemented for `CustomStruct`
   |
   = help: the following other types implement trait `ClassType`:
-            __RcTestObject
             NSObject
             __NSProxy
+            __RcTestObject
   = note: required for `CustomStruct` to implement `mutability::private_traits::Sealed`
 note: required by a bound in `IsIdCloneable`
  --> $WORKSPACE/crates/objc2/src/mutability.rs
@@ -23,9 +23,9 @@ error[E0277]: the trait bound `CustomStruct: ClassType` is not satisfied
   |                                       ^^^^^^^^^^^^ the trait `ClassType` is not implemented for `CustomStruct`
   |
   = help: the following other types implement trait `ClassType`:
-            __RcTestObject
             NSObject
             __NSProxy
+            __RcTestObject
   = note: required for `CustomStruct` to implement `IsAllowedMutable`
 note: required by a bound in `IsMutable`
  --> $WORKSPACE/crates/objc2/src/mutability.rs
diff --git a/crates/test-ui/ui/nsarray_bound_not_send_sync.stderr b/crates/test-ui/ui/nsarray_bound_not_send_sync.stderr
@@ -54,8 +54,8 @@ note: required because it appears within the type `AnyObject`
 note: required because it appears within the type `NSObject`
  --> $WORKSPACE/crates/objc2/src/runtime/nsobject.rs
   |
-  |     (NSObject)
-  |      ^^^^^^^^
+  | pub struct NSObject {
+  |            ^^^^^^^^
   = note: required for `Id<NSObject>` to implement `Sync`
 note: required because it appears within the type `PhantomData<Id<NSObject>>`
  --> $RUST/core/src/marker.rs
@@ -140,8 +140,8 @@ note: required because it appears within the type `AnyObject`
 note: required because it appears within the type `NSObject`
  --> $WORKSPACE/crates/objc2/src/runtime/nsobject.rs
   |
-  |     (NSObject)
-  |      ^^^^^^^^
+  | pub struct NSObject {
+  |            ^^^^^^^^
   = note: required for `Id<NSObject>` to implement `Send`
 note: required because it appears within the type `PhantomData<Id<NSObject>>`
  --> $RUST/core/src/marker.rs
@@ -220,8 +220,8 @@ note: required because it appears within the type `AnyObject`
 note: required because it appears within the type `NSObject`
  --> $WORKSPACE/crates/objc2/src/runtime/nsobject.rs
   |
-  |     (NSObject)
-  |      ^^^^^^^^
+  | pub struct NSObject {
+  |            ^^^^^^^^
   = note: required for `Id<NSObject>` to implement `Sync`
 note: required because it appears within the type `PhantomData<Id<NSObject>>`
  --> $RUST/core/src/marker.rs
@@ -316,8 +316,8 @@ note: required because it appears within the type `AnyObject`
 note: required because it appears within the type `NSObject`
  --> $WORKSPACE/crates/objc2/src/runtime/nsobject.rs
   |
-  |     (NSObject)
-  |      ^^^^^^^^
+  | pub struct NSObject {
+  |            ^^^^^^^^
   = note: required for `Id<NSObject>` to implement `Send`
 note: required because it appears within the type `PhantomData<Id<NSObject>>`
  --> $RUST/core/src/marker.rs
diff --git a/crates/test-ui/ui/nsarray_not_message.stderr b/crates/test-ui/ui/nsarray_not_message.stderr
@@ -6,11 +6,11 @@ error[E0277]: the trait bound `i32: Message` is not satisfied
   |
   = help: the following other types implement trait `Message`:
             Exception
+            NSObject
+            __NSProxy
             ProtocolObject<P>
             AnyObject
             __RcTestObject
-            NSObject
-            __NSProxy
             NSApplication
             NSCollectionView
           and $N others
@@ -38,9 +38,9 @@ error[E0277]: the trait bound `Id<NSObject>: ClassType` is not satisfied
   |                                        required by a bound introduced by this call
   |
   = help: the following other types implement trait `ClassType`:
-            __RcTestObject
             NSObject
             __NSProxy
+            __RcTestObject
             NSApplication
             NSCollectionView
             NSCollectionLayoutSection
diff --git a/crates/test-ui/ui/object_not_send_sync.stderr b/crates/test-ui/ui/object_not_send_sync.stderr
@@ -78,8 +78,8 @@ note: required because it appears within the type `AnyObject`
 note: required because it appears within the type `NSObject`
  --> $WORKSPACE/crates/objc2/src/runtime/nsobject.rs
   |
-  |     (NSObject)
-  |      ^^^^^^^^
+  | pub struct NSObject {
+  |            ^^^^^^^^
 note: required by a bound in `needs_sync`
  --> ui/object_not_send_sync.rs
   |
@@ -118,8 +118,8 @@ note: required because it appears within the type `AnyObject`
 note: required because it appears within the type `NSObject`
  --> $WORKSPACE/crates/objc2/src/runtime/nsobject.rs
   |
-  |     (NSObject)
-  |      ^^^^^^^^
+  | pub struct NSObject {
+  |            ^^^^^^^^
 note: required by a bound in `needs_send`
  --> ui/object_not_send_sync.rs
   |
@@ -147,8 +147,8 @@ note: required because it appears within the type `AnyObject`
 note: required because it appears within the type `NSObject`
  --> $WORKSPACE/crates/objc2/src/runtime/nsobject.rs
   |
-  |     (NSObject)
-  |      ^^^^^^^^
+  | pub struct NSObject {
+  |            ^^^^^^^^
 note: required because it appears within the type `NSValue`
  --> $WORKSPACE/crates/icrate/src/generated/Foundation/NSValue.rs
   |
@@ -192,8 +192,8 @@ note: required because it appears within the type `AnyObject`
 note: required because it appears within the type `NSObject`
  --> $WORKSPACE/crates/objc2/src/runtime/nsobject.rs
   |
-  |     (NSObject)
-  |      ^^^^^^^^
+  | pub struct NSObject {
+  |            ^^^^^^^^
 note: required because it appears within the type `NSValue`
  --> $WORKSPACE/crates/icrate/src/generated/Foundation/NSValue.rs
   |

Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ error[E0277]: the trait bound `MyObject: ClassType` is not satisfied
`12`	`12`	`\|`
`13`	`13`	= help: the following other types implement trait `ClassType`:
`14`	`14`	`MyRootClass`
`15`		`- __RcTestObject`
`16`	`15`	`NSObject`
`17`	`16`	`__NSProxy`
	`17`	`+ __RcTestObject`
`18`	`18`	= note: this error originates in the macro `$crate::__inner_extern_class` which comes from the expansion of the macro `extern_class` (in Nightly builds, run with -Z macro-backtrace for more info)
Original file line number	Diff line number	Diff line change
@@ -8,9 +8,9 @@ error[E0277]: the trait bound `AnyObject: ClassType` is not satisfied
`8`	`8`	`\| required by a bound introduced by this call`
`9`	`9`	`\|`
`10`	`10`	= help: the following other types implement trait `ClassType`:
`11`		`- __RcTestObject`
`12`	`11`	`NSObject`
`13`	`12`	`__NSProxy`
	`13`	`+ __RcTestObject`
`14`	`14`	note: required by a bound in `send_super_message_static`
`15`	`15`	`--> $WORKSPACE/crates/objc2/src/__macro_helpers/msg_send.rs`
`16`	`16`	`\|`
@@ -30,9 +30,9 @@ error[E0277]: the trait bound `AnyObject: ClassType` is not satisfied
`30`	`30`	`\| required by a bound introduced by this call`
`31`	`31`	`\|`
`32`	`32`	= help: the following other types implement trait `ClassType`:
`33`		`- __RcTestObject`
`34`	`33`	`NSObject`
`35`	`34`	`__NSProxy`
	`35`	`+ __RcTestObject`
`36`	`36`	note: required by a bound in `send_super_message_static`
`37`	`37`	`--> $WORKSPACE/crates/objc2/src/__macro_helpers/msg_send.rs`
`38`	`38`	`\|`