Properly mark NSEnumerator as unsafe to return

Author: madsmtm

crates/header-translator/src/rust_type.rs

@@ -1068,6 +1068,10 @@ impl PointeeTy {
                 } else if id.name == "NSObject" {
                     // `NSObject` has similar safety to `AnyObject`.
                     safety = TypeSafety::unknown_in_argument("should be of the correct type");
+                } else if id.name == "NSEnumerator" {
+                    safety = TypeSafety::unsafe_in_return(
+                        "enumerator's underlying collection should not be mutated while in use",
+                    );
                 }
 
                 if id.name.contains("Mutable") {

framework-crates/objc2-foundation/translation-config.toml

@@ -330,19 +330,8 @@ unsafe-default-safety.functions = true
 # Foundation's methods are bounds-checked and throw exceptions.
 unsafe-default-safety.not-bounds-affecting = false
 
-# Collections may not be mutated while enumerating.
-class.NSArray.methods.objectEnumerator.unsafe = true
-class.NSArray.methods.reverseObjectEnumerator.unsafe = true
-class.NSDictionary.methods.objectEnumerator.unsafe = true
-class.NSDictionary.methods.keyEnumerator.unsafe = true
-class.NSSet.methods.objectEnumerator.unsafe = true
-class.NSCountedSet.methods.objectEnumerator.unsafe = true
-class.NSOrderedSet.methods.objectEnumerator.unsafe = true
-class.NSOrderedSet.methods.reverseObjectEnumerator.unsafe = true
-class.NSMapTable.methods.objectEnumerator.unsafe = true
-class.NSMapTable.methods.keyEnumerator.unsafe = true
-class.NSHashTable.methods.objectEnumerator.unsafe = true
-# Enumerators themselves are safe to use, we move unsoundness to their creation above.
+# Enumerators themselves are safe to use, we move unsoundness to their creation
+# in `header-translator`.
 class.NSEnumerator.methods.nextObject.unsafe = false
 class.NSEnumerator.methods.allObjects.unsafe = false
 

framework-crates/objc2-metal-performance-shaders/translation-config.toml

@@ -32,3 +32,11 @@ const.MPSNDArrayConstantMultiDestIndex1.skipped = false
 const.MPSNDArrayConstantMultiDestSrcAddressingIndex.skipped = false
 const.MPSNDArrayConstantMultiDestDstAddressingIndex.skipped = false
 const.MPSUserAvailableFunctionConstantStartIndex.skipped = false
+
+##
+## Safety
+##
+
+# Unarchival may be unsafe if not requiring secure encoding, so let's
+# be conservative in what we mark safe for now.
+class.MPSKeyedUnarchiver.unsafe = true