TMP

Author: madsmtm

objc2/src/__macro_helpers.rs

@@ -107,7 +107,10 @@ impl<T: ?Sized + Message, O: Ownership> MsgSendId<&'_ Class, T, O> for New {
     }
 }
 
-impl<T: ?Sized + Message, O: Ownership> MsgSendId<&'_ Class, Allocated<T>, O> for Alloc {
+impl<T: ?Sized + Message, O: Ownership> MsgSendId<&'_ Class, Allocated<T>, O> for Alloc
+where
+    Allocated<T>: Thin,
+{
     #[inline]
     #[track_caller]
     unsafe fn send_message_id<A: MessageArguments, R: MaybeUnwrap<Allocated<T>, O>>(
@@ -123,7 +126,10 @@ impl<T: ?Sized + Message, O: Ownership> MsgSendId<&'_ Class, Allocated<T>, O> fo
     }
 }
 
-impl<T: ?Sized + Message, O: Ownership> MsgSendId<Option<Id<Allocated<T>, O>>, T, O> for Init {
+impl<T: ?Sized + Message, O: Ownership> MsgSendId<Option<Id<Allocated<T>, O>>, T, O> for Init
+where
+    Allocated<T>: Thin,
+{
     #[inline]
     #[track_caller]
     unsafe fn send_message_id<A: MessageArguments, R: MaybeUnwrap<T, O>>(

objc2/src/foundation/array.rs

@@ -8,9 +8,11 @@ use super::{
     NSCopying, NSEnumerator, NSFastEnumeration, NSFastEnumerator, NSMutableArray, NSMutableCopying,
     NSObject, NSRange,
 };
-use crate::rc::{DefaultId, Id, Owned, Ownership, Shared, SliceId};
+use crate::rc::{Allocated, DefaultId, Id, Owned, Ownership, Shared, SliceId};
 use crate::runtime::{Class, Object};
-use crate::{ClassType, Message, __inner_extern_class, extern_methods, msg_send, msg_send_id};
+use crate::{
+    ClassType, Message, Thin, __inner_extern_class, extern_methods, msg_send, msg_send_id,
+};
 
 __inner_extern_class!(
     /// An immutable ordered collection of objects.
@@ -79,7 +81,10 @@ impl<T: ?Sized + Message + UnwindSafe> UnwindSafe for NSArray<T, Owned> {}
 pub(crate) unsafe fn with_objects<T: ?Sized + Message, R: ?Sized + Message, O: Ownership>(
     cls: &Class,
     objects: &[&T],
-) -> Id<R, O> {
+) -> Id<R, O>
+where
+    Allocated<R>: Thin,
+{
     unsafe {
         msg_send_id![
             msg_send_id![cls, alloc],

objc2/src/foundation/set.rs

@@ -7,9 +7,11 @@ use super::{
     NSArray, NSCopying, NSEnumerator, NSFastEnumeration, NSFastEnumerator, NSMutableCopying,
     NSMutableSet, NSObject,
 };
-use crate::rc::{DefaultId, Id, Owned, Ownership, Shared, SliceId};
+use crate::rc::{Allocated, DefaultId, Id, Owned, Ownership, Shared, SliceId};
 use crate::runtime::Class;
-use crate::{ClassType, Message, __inner_extern_class, extern_methods, msg_send, msg_send_id};
+use crate::{
+    ClassType, Message, Thin, __inner_extern_class, extern_methods, msg_send, msg_send_id,
+};
 
 __inner_extern_class!(
     /// An immutable unordered collection of unique objects.
@@ -45,7 +47,10 @@ impl<T: ?Sized + Message + UnwindSafe> UnwindSafe for NSSet<T, Owned> {}
 pub(crate) unsafe fn with_objects<T: ?Sized + Message, R: ?Sized + Message, O: Ownership>(
     cls: &Class,
     objects: &[&T],
-) -> Id<R, O> {
+) -> Id<R, O>
+where
+    Allocated<R>: Thin,
+{
     unsafe {
         msg_send_id![
             msg_send_id![cls, alloc],

objc2/src/rc/id.rs

@@ -138,7 +138,10 @@ impl<T: ?Sized + Thin, O: Ownership> Id<T, O> {
     }
 }
 
-impl<T: ?Sized + Message, O: Ownership> Id<Allocated<T>, O> {
+impl<T: ?Sized + Message, O: Ownership> Id<Allocated<T>, O>
+where
+    Allocated<T>: Thin,
+{
     #[inline]
     pub(crate) unsafe fn new_allocated(ptr: *mut T) -> Option<Self> {
         // SAFETY: Upheld by the caller