Merge pull request #232 from madsmtm/foundation-id-usage

Improve safety in foundation collection types wrt. ownership

Author: madsmtm

objc2/CHANGELOG.md

@@ -16,7 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   `objc2-foundation`.
 
 ### Changed
-* Change selector syntax in `declare_class!` macro to be more Rust-like.
+* **BREAKING**: Change selector syntax in `declare_class!` macro to be more Rust-like.
 
 
 ## 0.3.0-beta.1 - 2022-07-19

objc2/CHANGELOG_FOUNDATION.md

@@ -20,13 +20,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   of the `NSValue` matches the encoding of the given type.
 * Added functions `get_range`, `get_point`, `get_size` and `get_rect` to
   `NSValue` to help safely returning various types it will commonly contain.
+* `NSArray` and `NSMutableArray` now have sensible defaults for the ownership
+  of the objects they contain.
 
 ### Changed
 * **BREAKING**: Moved from external crate `objc2_foundation` into
   `objc2::foundation`.
 * **BREAKING**: Made `NSValue` not generic any more. While we loose some
   type-safety from this, it makes `NSValue` much more useful in the real
   world!
+* **BREAKING**: Made `NSArray::new` generic over ownership.
 
 ### Fixed
 * Made `Debug` impls for all objects print something useful.

objc2/src/__macro_helpers.rs

@@ -274,15 +274,13 @@ mod tests {
 
     #[test]
     fn test_alloc_with_zone() {
-        let expected = ThreadTestData::current();
+        let mut expected = ThreadTestData::current();
         let cls = RcTestObject::class();
 
         let zone: *const NSZone = ptr::null();
         let _obj: Id<Allocated<RcTestObject>, Owned> =
             unsafe { msg_send_id![cls, allocWithZone: zone].unwrap() };
-        // `+[NSObject alloc]` delegates to `+[NSObject allocWithZone:]`, but
-        // `RcTestObject` only catches `alloc`.
-        // expected.alloc += 1;
+        expected.alloc += 1;
         expected.assert_current();
     }
 
@@ -325,9 +323,18 @@ mod tests {
             expected.init += 1;
             expected.assert_current();
 
-            // TODO:
-            // let copy: Id<RcTestObject, Shared> = unsafe { msg_send_id![&obj, copy].unwrap() };
-            // let mutable_copy: Id<RcTestObject, Shared> = unsafe { msg_send_id![&obj, mutableCopy].unwrap() };
+            let _copy: Id<RcTestObject, Shared> = unsafe { msg_send_id![&obj, copy].unwrap() };
+            expected.copy += 1;
+            expected.alloc += 1;
+            expected.init += 1;
+            expected.assert_current();
+
+            let _mutable_copy: Id<RcTestObject, Shared> =
+                unsafe { msg_send_id![&obj, mutableCopy].unwrap() };
+            expected.mutable_copy += 1;
+            expected.alloc += 1;
+            expected.init += 1;
+            expected.assert_current();
 
             let _self: Id<RcTestObject, Shared> = unsafe { msg_send_id![&obj, self].unwrap() };
             expected.retain += 1;
@@ -337,8 +344,8 @@ mod tests {
                 unsafe { msg_send_id![&obj, description] };
             expected.assert_current();
         });
-        expected.release += 3;
-        expected.dealloc += 2;
+        expected.release += 5;
+        expected.dealloc += 4;
         expected.assert_current();
     }