Merge pull request #19671 from itaiferber/foundation-minor-abi-cleanup

Author: swift-ci

Darwin/Foundation-swiftoverlay/Boxing.swift

@@ -62,9 +62,3 @@ extension _MutableBoxing {
         return whatToDo(_handle._pointer)
     }
 }
-
-internal enum _MutableUnmanagedWrapper<ImmutableType : NSObject, MutableType : NSObject>
-  where MutableType : NSMutableCopying{
-    case Immutable(Unmanaged<ImmutableType>)
-    case Mutable(Unmanaged<MutableType>)
-}

Darwin/Foundation-swiftoverlay/Decimal.swift

@@ -13,6 +13,8 @@
 @_exported import Foundation // Clang module
 import _SwiftCoreFoundationOverlayShims
 
+// The methods in this extension exist to match the protocol requirements of FloatinPoint, even if we can't conform directly.
+// If it becomes clear that conformance is truly impossible, we can deprecate some of the methods (e.g. isEqual(to:)) in favor of operators.
 extension Decimal {
     public typealias RoundingMode = NSDecimalNumber.RoundingMode
     public typealias CalculationError = NSDecimalNumber.CalculationError

Darwin/Foundation-swiftoverlay/NSCoder.swift

@@ -229,16 +229,3 @@ extension NSKeyedUnarchiver {
     }
   }
 }
-
-
-@available(*, deprecated, renamed:"NSCoding", message: "Please use NSCoding")
-typealias Coding = NSCoding
-
-@available(*, deprecated, renamed:"NSCoder", message: "Please use NSCoder")
-typealias Coder = NSCoder
-
-@available(*, deprecated, renamed:"NSKeyedUnarchiver", message: "Please use NSKeyedUnarchiver")
-typealias KeyedUnarchiver = NSKeyedUnarchiver
-
-@available(*, deprecated, renamed:"NSKeyedArchiver", message: "Please use NSKeyedArchiver")
-typealias KeyedArchiver = NSKeyedArchiver

Darwin/Foundation-swiftoverlay/NSDictionary.swift

@@ -34,7 +34,7 @@ extension Dictionary {
   ///
   /// The provided `NSDictionary` will be copied to ensure that the copy can
   /// not be mutated by other code.
-  public init(_cocoaDictionary: __shared _NSDictionary) {
+  fileprivate init(_cocoaDictionary: __shared _NSDictionary) {
     assert(
       _isBridgedVerbatimToObjectiveC(Key.self) &&
       _isBridgedVerbatimToObjectiveC(Value.self),

Darwin/Foundation-swiftoverlay/NSGeometry.swift

@@ -20,35 +20,15 @@ import CoreGraphics
 // NSRectEdge
 //===----------------------------------------------------------------------===//
 
-// In the SDK, the following NS*Edge constants are defined as macros for the
-// corresponding CGRectEdge enumerators.  Thus, in the SDK, NS*Edge constants
-// have CGRectEdge type.  This is not correct for Swift (as there is no
-// implicit conversion to NSRectEdge).
-
-@available(*, unavailable, renamed: "NSRectEdge.MinX")
-public var NSMinXEdge: NSRectEdge {
-  fatalError("unavailable property can't be accessed")
-}
-@available(*, unavailable, renamed: "NSRectEdge.MinY")
-public var NSMinYEdge: NSRectEdge {
-  fatalError("unavailable property can't be accessed")
-}
-@available(*, unavailable, renamed: "NSRectEdge.MaxX")
-public var NSMaxXEdge: NSRectEdge {
-  fatalError("unavailable property can't be accessed")
-}
-@available(*, unavailable, renamed: "NSRectEdge.MaxY")
-public var NSMaxYEdge: NSRectEdge {
-  fatalError("unavailable property can't be accessed")
-}
-
 extension NSRectEdge {
+  @inlinable
   public init(rectEdge: CGRectEdge) {
     self = NSRectEdge(rawValue: UInt(rectEdge.rawValue))!
   }
 }
 
 extension CGRectEdge {
+  @inlinable
   public init(rectEdge: NSRectEdge) {
     self = CGRectEdge(rawValue: UInt32(rectEdge.rawValue))!
   }

Darwin/Foundation-swiftoverlay/NSIndexSet.swift

@@ -12,7 +12,7 @@
 
 @_exported import Foundation // Clang module
 
-// FIXME: move inside NSIndexSet when the compiler supports this.
+// TODO: Evaluate deprecating with a message in favor of IndexSet.
 public struct NSIndexSetIterator : IteratorProtocol {
   public typealias Element = Int
 

Darwin/Foundation-swiftoverlay/NSObject.swift

@@ -13,7 +13,10 @@
 @_exported import Foundation // Clang module
 import ObjectiveC
 
+// This exists to allow for dynamic dispatch on KVO methods added to NSObject.
+// Extending NSObject with these methods would disallow overrides.
 public protocol _KeyValueCodingAndObserving {}
+extension NSObject : _KeyValueCodingAndObserving {}
 
 public struct NSKeyValueObservedChange<Value> {
     public typealias Kind = NSKeyValueChange
@@ -230,5 +233,3 @@ extension _KeyValueCodingAndObserving {
         (self as! NSObject).didChangeValue(forKey: _bridgeKeyPathToString(keyPath), withSetMutation: mutation, using: set)
     }
 }
-
-extension NSObject : _KeyValueCodingAndObserving {}

Darwin/Foundation-swiftoverlay/NSSet.swift

@@ -17,7 +17,7 @@ extension Set {
   ///
   /// The provided `NSSet` will be copied to ensure that the copy can
   /// not be mutated by other code.
-  public init(_cocoaSet: __shared _NSSet) {
+  fileprivate init(_cocoaSet: __shared _NSSet) {
     assert(_isBridgedVerbatimToObjectiveC(Element.self),
       "Set can be backed by NSSet _variantStorage only when the member type can be bridged verbatim to Objective-C")
     // FIXME: We would like to call CFSetCreateCopy() to avoid doing an