Implement IsIdCloneable for AnyObject

Author: madsmtm

crates/icrate/tests/array.rs

@@ -1,9 +1,11 @@
 #![cfg(feature = "Foundation_NSArray")]
 #![cfg(feature = "Foundation_NSNumber")]
+use core::ptr;
+
 use icrate::Foundation::{NSArray, NSNumber, NSObject};
 use objc2::mutability::IsRetainable;
 use objc2::rc::{Id, __RcTestObject, __ThreadTestData};
-use objc2::runtime::ProtocolObject;
+use objc2::runtime::{AnyObject, ProtocolObject};
 use objc2::{extern_protocol, ProtocolType};
 
 fn sample_array(len: usize) -> Id<NSArray<NSObject>> {
@@ -283,3 +285,15 @@ fn test_trait_retainable() {
     let _ = NSArray::from_id_slice(&[obj.clone(), obj.clone()]);
     let _ = NSArray::from_vec(vec![obj.clone(), obj.clone()]);
 }
+
+#[test]
+fn test_access_anyobject() {
+    let obj: Id<AnyObject> = Id::into_super(NSObject::new());
+    let array = NSArray::from_id_slice(&[obj.clone(), obj.clone()]);
+    assert!(ptr::eq(&array[0], &*obj));
+    assert!(ptr::eq(array.get(0).unwrap(), &*obj));
+    assert!(ptr::eq(&*array.get_retained(0).unwrap(), &*obj));
+    for _ in array.iter() {}
+    for _ in array.iter_retained() {}
+    for _ in array {}
+}

crates/objc2/CHANGELOG.md

@@ -56,6 +56,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 * Fixed the name of the protocol that `NSObjectProtocol` references.
+* Allow cloning `Id<AnyObject>`.
 
 ### Removed
 * **BREAKING**: Removed `ProtocolType` implementation for `NSObject`.

crates/objc2/src/mutability.rs

@@ -32,7 +32,7 @@
 //! bug.
 use core::marker::PhantomData;
 
-use crate::runtime::ProtocolObject;
+use crate::runtime::{AnyObject, ProtocolObject};
 use crate::{ClassType, Message, ProtocolType};
 
 mod private_mutability {
@@ -266,6 +266,7 @@ mod private_traits {
 
 impl<T: ?Sized + ClassType> private_traits::Sealed for T {}
 impl<P: ?Sized + ProtocolType> private_traits::Sealed for ProtocolObject<P> {}
+impl private_traits::Sealed for AnyObject {}
 
 /// Marker trait for classes where [`Id::clone`] is safe.
 ///
@@ -299,6 +300,8 @@ impl MutabilityIsIdCloneable for MainThreadOnly {}
 
 unsafe impl<T: ?Sized + ClassType> IsIdCloneable for T where T::Mutability: MutabilityIsIdCloneable {}
 unsafe impl<P: ?Sized + ProtocolType + IsIdCloneable> IsIdCloneable for ProtocolObject<P> {}
+// SAFETY: Same as for root classes.
+unsafe impl IsIdCloneable for AnyObject {}
 
 /// Marker trait for classes where the `retain` selector is always safe.
 ///

crates/objc2/src/rc/id.rs

@@ -951,9 +951,21 @@ mod tests {
         assert_retain_count(&cloned, 2);
         assert_retain_count(&obj, 2);
 
+        let obj = Id::into_super(Id::into_super(obj));
+        let cloned_and_type_erased = obj.clone();
+        expected.retain += 1;
+        expected.assert_current();
+        assert_retain_count(&cloned_and_type_erased, 3);
+        assert_retain_count(&obj, 3);
+
         drop(obj);
         expected.release += 1;
         expected.assert_current();
+        assert_retain_count(&cloned, 2);
+
+        drop(cloned_and_type_erased);
+        expected.release += 1;
+        expected.assert_current();
         assert_retain_count(&cloned, 1);
 
         drop(cloned);