Change the object macro syntax a bit

Author: madsmtm

objc2-foundation/src/array.rs

@@ -169,9 +169,10 @@ object!(
     /// TODO: Can we make it impossible? Should we?
     ///
     /// What about `Id<NSArray<T, Shared>, Owned>`?
-    unsafe pub struct<T: INSObject, O: Ownership> NSArray<T, O: Ownership> {
+    unsafe pub struct NSArray<T, O: Ownership> {
         item: PhantomData<Id<T, O>>,
     }
+    impl where T: INSObject
 );
 
 unsafe impl<T: INSObject, O: Ownership> INSArray for NSArray<T, O> {
@@ -314,9 +315,10 @@ pub unsafe trait INSMutableArray: INSArray {
 }
 
 object!(
-    unsafe pub struct<T: INSObject, O: Ownership> NSMutableArray<T, O: Ownership> {
+    unsafe pub struct NSMutableArray<T, O: Ownership> {
         item: PhantomData<Id<T, O>>,
     }
+    impl where T: INSObject
 );
 
 unsafe impl<T: INSObject, O: Ownership> INSArray for NSMutableArray<T, O> {

objc2-foundation/src/dictionary.rs

@@ -139,10 +139,13 @@ pub unsafe trait INSDictionary: INSObject {
 }
 
 object!(
-    unsafe pub struct<K: INSObject, V: INSObject> NSDictionary<K, V> {
+    unsafe pub struct NSDictionary<K, V> {
         key: PhantomData<Id<K, Shared>>,
         obj: PhantomData<Id<V, Owned>>,
     }
+    impl where
+        K: INSObject,
+        V: INSObject,
 );
 
 impl<K: INSObject, V: INSObject> NSDictionary<K, V> {

objc2-foundation/src/macros.rs

@@ -7,56 +7,56 @@
 /// example: `NSAutoreleasePool` does not have this). Finally the ownership
 /// must be correct for this class.
 macro_rules! object {
-    ($(#[$m:meta])* unsafe $v:vis struct $name:ident) => {
-        object!($(#[$m])* unsafe $v struct<()> $name<> {});
+    (
+        $(#[$m:meta])*
+        unsafe $v:vis struct $name:ident
+    ) => {
+        object!($(#[$m])* unsafe $v struct $name<> {});
     };
-    ($(#[$m:meta])* unsafe $v:vis struct<$($t:ident $(: $b:ident)?),+> $name:ident<$($t2:ident $(: $b2:ident)?),+> {
-        $($p:ident: $pty:ty,)*
-    }) => {
-        object!($(#[$m])* unsafe $v struct<($($t $(: $b)?),+)> $name<$($t2 $(: $b2)?),+> {
-            $($p: $pty,)*
-        });
-    };
-    ($(#[$m:meta])* unsafe $v:vis struct<($($t:tt)*)> $name:ident<$($t2:ident $(: $b2:ident)?),*> {
-        $($p:ident: $pty:ty,)*
-    }) => {
+    (
+        $(#[$m:meta])*
+        unsafe $v:vis struct $name:ident<$($t:ident $(: $b:ident)?),*> {
+            $($p:ident: $pty:ty,)*
+        }
+        $(impl where $($w:tt)+)?
+    ) => {
         // TODO: `extern type`
         $(#[$m])*
         #[repr(C)]
-        $v struct $name<$($t2 $(: $b2)?),*> {
+        $v struct $name<$($t $(: $b)?),*> {
             _private: [u8; 0],
             $($p: $pty),*
         }
 
-        unsafe impl<$($t)*> ::objc2::Message for $name<$($t2),*> { }
+        unsafe impl<$($t $(: $b)?),*> ::objc2::Message for $name<$($t),*> { }
 
-        unsafe impl<$($t)*> ::objc2::RefEncode for $name<$($t2),*> {
+        unsafe impl<$($t $(: $b)?),*> ::objc2::RefEncode for $name<$($t),*> {
             const ENCODING_REF: ::objc2::Encoding<'static> = ::objc2::Encoding::Object;
         }
 
-        unsafe impl<$($t)*> $crate::INSObject for $name<$($t2),*> {
+        unsafe impl<$($t $(: $b)?),*> $crate::INSObject for $name<$($t),*> {
             fn class() -> &'static ::objc2::runtime::Class {
                 ::objc2::class!($name)
             }
         }
 
-        impl<$($t)*> ::core::cmp::PartialEq for $name<$($t2),*> {
+        impl<$($t $(: $b)?),*> ::core::cmp::PartialEq for $name<$($t),*> {
             fn eq(&self, other: &Self) -> bool {
                 use $crate::INSObject;
                 self.is_equal(other)
             }
         }
 
-        impl<$($t)*> ::core::cmp::Eq for $name<$($t2),*> {}
+        impl<$($t $(: $b)?),*> ::core::cmp::Eq for $name<$($t),*> {}
 
-        impl<$($t)*> ::core::hash::Hash for $name<$($t2),*> {
+        impl<$($t $(: $b)?),*> ::core::hash::Hash for $name<$($t),*> {
             fn hash<H: ::core::hash::Hasher>(&self, state: &mut H) {
                 use $crate::INSObject;
                 self.hash_code().hash(state);
             }
         }
 
-        impl<$($t)*> ::core::fmt::Debug for $name<$($t2),*> {
+        impl<$($t $(: $b)?),*> ::core::fmt::Debug for $name<$($t),*> {
             fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
                 use $crate::{INSObject, INSString};
                 ::objc2::rc::autoreleasepool(|pool| {

objc2-foundation/src/value.rs

@@ -70,9 +70,10 @@ pub unsafe trait INSValue: INSObject {
 }
 
 object!(
-    unsafe pub struct<(T: 'static)> NSValue<T> {
+    unsafe pub struct NSValue<T> {
         value: PhantomData<T>,
     }
+    impl where T: 'static
 );
 
 unsafe impl<T: 'static + Copy + Encode> INSValue for NSValue<T> {