[stdlib] Set, Dictionary: Make internal representations conform to Sequence

Author: lorentey

stdlib/public/core/Dictionary.swift

@@ -2080,10 +2080,6 @@ final internal class _HashableTypedNativeDictionaryStorage<Key: Hashable, Value>
     return _NativeDictionary(_storage: self)
   }
 
-  internal var full: Dictionary<Key, Value> {
-    return Dictionary(_native: native)
-  }
-
   @objc
   internal override func enumerator() -> _NSEnumerator {
     return _SwiftDictionaryNSEnumerator<Key, Value>(
@@ -2169,15 +2165,15 @@ final internal class _HashableTypedNativeDictionaryStorage<Key: Hashable, Value>
     if let unmanagedKeys = _UnmanagedAnyObjectArray(keys) {
       if let unmanagedObjects = _UnmanagedAnyObjectArray(objects) {
         // keys nonnull, objects nonnull
-        for (key, value) in full {
+        for (key, value) in native {
           unmanagedObjects[i] = _bridgeAnythingToObjectiveC(value)
           unmanagedKeys[i] = _bridgeAnythingToObjectiveC(key)
           i += 1
           guard i < count else { break }
         }
       } else {
         // keys nonnull, objects null
-        for (key, _) in full {
+        for (key, _) in native {
           unmanagedKeys[i] = _bridgeAnythingToObjectiveC(key)
           i += 1
           guard i < count else { break }
@@ -2186,7 +2182,7 @@ final internal class _HashableTypedNativeDictionaryStorage<Key: Hashable, Value>
     } else {
       if let unmanagedObjects = _UnmanagedAnyObjectArray(objects) {
         // keys null, objects nonnull
-        for (_, value) in full {
+        for (_, value) in native {
           unmanagedObjects[i] = _bridgeAnythingToObjectiveC(value)
           i += 1
           guard i < count else { break }
@@ -2589,8 +2585,9 @@ extension _NativeDictionary where Key: Hashable {
     maxLoadFactorInverse: Double
   ) -> Int {
     // `capacity + 1` below ensures that we don't fill in the last hole
-    return max(Int((Double(capacity) * maxLoadFactorInverse).rounded(.up)),
-               capacity + 1)
+    return Swift.max(
+      Int((Double(capacity) * maxLoadFactorInverse).rounded(.up)),
+      capacity + 1)
   }
 
   /// Self should be uniquely referenced.
@@ -4224,7 +4221,7 @@ extension Dictionary.Index: Hashable {
   }
 }
 
-extension _NativeDictionary {
+extension _NativeDictionary: Sequence {
   @usableFromInline
   @_fixed_layout
   internal struct Iterator {
@@ -4269,7 +4266,7 @@ extension _NativeDictionary.Iterator: IteratorProtocol {
 }
 
 #if _runtime(_ObjC)
-extension _CocoaDictionary {
+extension _CocoaDictionary: Sequence {
   @usableFromInline
   final internal class Iterator {
     // Cocoa Dictionary iterator has to be a class, otherwise we cannot

stdlib/public/core/Set.swift

@@ -2106,8 +2106,9 @@ extension _NativeSet/*: _SetBuffer*/ where Element: Hashable {
     maxLoadFactorInverse: Double
   ) -> Int {
     // `capacity + 1` below ensures that we don't fill in the last hole
-    return max(Int((Double(capacity) * maxLoadFactorInverse).rounded(.up)),
-               capacity + 1)
+    return Swift.max(
+      Int((Double(capacity) * maxLoadFactorInverse).rounded(.up)),
+      capacity + 1)
   }
 
   /// Buffer should be uniquely referenced.
@@ -3421,7 +3422,7 @@ extension Set.Index: Hashable {
   }
 }
 
-extension _NativeSet {
+extension _NativeSet: Sequence {
   @usableFromInline
   @_fixed_layout
   internal struct Iterator {
@@ -3463,7 +3464,7 @@ extension _NativeSet.Iterator: IteratorProtocol {
 }
 
 #if _runtime(_ObjC)
-extension _CocoaSet {
+extension _CocoaSet: Sequence {
   @usableFromInline
   final internal class Iterator {
     // Cocoa Set iterator has to be a class, otherwise we cannot