Merge pull request #3710 from jckarter/turn-on-id-as-any

Turn on id as any

Author: jckarter

Darwin/Foundation-swiftoverlay/AffineTransform.swift

@@ -264,10 +264,6 @@ extension AffineTransform : ReferenceConvertible, Hashable, CustomStringConverti
 }
 
 extension AffineTransform : _ObjectiveCBridgeable {
-    public static func _isBridgedToObjectiveC() -> Bool {
-        return true
-    }
-    
     public static func _getObjectiveCType() -> Any.Type {
         return NSAffineTransform.self
     }

Darwin/Foundation-swiftoverlay/Boxing.swift

@@ -75,7 +75,7 @@ internal protocol _SwiftNativeFoundationType : class {
     init(unmanagedImmutableObject: Unmanaged<ImmutableType>)
     init(unmanagedMutableObject: Unmanaged<MutableType>)
 
-    func mutableCopy(with zone : NSZone) -> AnyObject
+    func mutableCopy(with zone : NSZone?) -> Any
 
     var hashValue: Int { get }
     var description: String { get }
@@ -115,7 +115,7 @@ extension _SwiftNativeFoundationType {
         }
     }
 
-    func mutableCopy(with zone : NSZone) -> AnyObject {
+    func mutableCopy(with zone : NSZone?) -> Any {
         return _mapUnmanaged { $0.mutableCopy() }
     }
 

Darwin/Foundation-swiftoverlay/Calendar.swift

@@ -107,7 +107,7 @@ public struct Calendar : CustomStringConvertible, CustomDebugStringConvertible,
     ///
     /// - parameter identifier: The kind of calendar to use.
     public init(identifier: Identifier) {
-        let result = __NSCalendarInit(Calendar._toNSCalendarIdentifier(identifier))!
+        let result = __NSCalendarInit(Calendar._toNSCalendarIdentifier(identifier).rawValue as NSString)!
         _handle = _MutableHandle(adoptingReference: result)
         _autoupdating = false
     }
@@ -1082,10 +1082,6 @@ public struct Calendar : CustomStringConvertible, CustomDebugStringConvertible,
 }
 
 extension Calendar : _ObjectiveCBridgeable {
-    public static func _isBridgedToObjectiveC() -> Bool {
-        return true
-    }
-    
     @_semantics("convertToObjectiveC")
     public func _bridgeToObjectiveC() -> NSCalendar {
         return _handle._copiedReference()

Darwin/Foundation-swiftoverlay/CharacterSet.swift

@@ -51,12 +51,12 @@ internal final class _SwiftNSCharacterSet : _SwiftNativeNSCharacterSet, _SwiftNa
     }
 
     @objc(copyWithZone:)
-    func copy(with zone: NSZone? = nil) -> AnyObject {
+    func copy(with zone: NSZone? = nil) -> Any {
         return _mapUnmanaged { $0.copy(with: zone) }
     }
 
     @objc(mutableCopyWithZone:)
-    func mutableCopy(with zone: NSZone? = nil) -> AnyObject {
+    func mutableCopy(with zone: NSZone? = nil) -> Any {
         return _mapUnmanaged { $0.mutableCopy(with: zone) }
     }
 
@@ -84,7 +84,7 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
 
     private init(_bridged characterSet: NSCharacterSet) {
         // We must copy the input because it might be mutable; just like storing a value type in ObjC
-        _wrapped = _SwiftNSCharacterSet(immutableObject: characterSet.copy())
+        _wrapped = _SwiftNSCharacterSet(immutableObject: characterSet.copy() as AnyObject)
     }
 
     /// Initialize an empty instance.
@@ -439,10 +439,6 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
 
 // MARK: Objective-C Bridging
 extension CharacterSet : _ObjectiveCBridgeable {
-    public static func _isBridgedToObjectiveC() -> Bool {
-        return true
-    }
-    
     public static func _getObjectiveCType() -> Any.Type {
         return NSCharacterSet.self
     }

Darwin/Foundation-swiftoverlay/Data.swift

@@ -253,7 +253,7 @@ public struct Data : ReferenceConvertible, CustomStringConvertible, Equatable, H
     ///
     /// - parameter reference: The instance of `NSData` that you wish to wrap. This instance will be copied by `struct Data`.
     public init(referencing reference: NSData) {
-        _wrapped = _SwiftNSData(immutableObject: reference.copy())
+        _wrapped = _SwiftNSData(immutableObject: reference.copy() as AnyObject)
     }
 
     // -----------------------------------
@@ -678,10 +678,6 @@ public struct Data : ReferenceConvertible, CustomStringConvertible, Equatable, H
 
 /// Provides bridging functionality for struct Data to class NSData and vice-versa.
 extension Data : _ObjectiveCBridgeable {
-    public static func _isBridgedToObjectiveC() -> Bool {
-        return true
-    }
-    
     @_semantics("convertToObjectiveC")
     public func _bridgeToObjectiveC() -> NSData {
         return unsafeBitCast(_wrapped, to: NSData.self)

Darwin/Foundation-swiftoverlay/Date.swift

@@ -229,10 +229,6 @@ public struct Date : ReferenceConvertible, Comparable, Equatable, CustomStringCo
 }
 
 extension Date : _ObjectiveCBridgeable {
-    public static func _isBridgedToObjectiveC() -> Bool {
-        return true
-    }
-    
     @_semantics("convertToObjectiveC")
     public func _bridgeToObjectiveC() -> NSDate {
         return NSDate(timeIntervalSinceReferenceDate: _time)

Darwin/Foundation-swiftoverlay/DateComponents.swift

@@ -292,10 +292,6 @@ public struct DateComponents : ReferenceConvertible, Hashable, Equatable, _Mutab
 // MARK: - Bridging
 
 extension DateComponents : _ObjectiveCBridgeable {
-    public static func _isBridgedToObjectiveC() -> Bool {
-        return true
-    }
-    
     public static func _getObjectiveCType() -> Any.Type {
         return NSDateComponents.self
     }

Darwin/Foundation-swiftoverlay/DateInterval.swift

@@ -183,10 +183,6 @@ public struct DateInterval : ReferenceConvertible, Comparable, Hashable {
 
 @available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
 extension DateInterval : _ObjectiveCBridgeable {
-    public static func _isBridgedToObjectiveC() -> Bool {
-        return true
-    }
-    
     public static func _getObjectiveCType() -> Any.Type {
         return NSDateInterval.self
     }

Darwin/Foundation-swiftoverlay/Decimal.swift

@@ -436,10 +436,6 @@ extension Decimal : CustomStringConvertible {
 }
 
 extension Decimal : _ObjectiveCBridgeable {
-    public static func _isBridgedToObjectiveC() -> Bool {
-        return true
-    }
-    
     @_semantics("convertToObjectiveC")
     public func _bridgeToObjectiveC() -> NSDecimalNumber {
         return NSDecimalNumber(decimal: self)

Darwin/Foundation-swiftoverlay/FileManager.swift

@@ -40,7 +40,7 @@ extension FileManager {
     @available(OSX 10.6, iOS 4.0, *)
     public func replaceItemAt(_ originalItemURL: URL, withItemAt newItemURL: URL, backupItemName: String? = nil, options: FileManager.ItemReplacementOptions = []) throws -> NSURL? {
         var error: NSError? = nil
-        if let result = NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options(self, originalItemURL as URL, newItemURL as URL, backupItemName, options, &error) {
+        if let result = NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options(self, originalItemURL as NSURL, newItemURL as NSURL, backupItemName, options, &error) {
             return result
         }
         throw error!