Merge pull request #307 from harlanhaskins/se-0046-lingering

Fixed lingering SE-0046 changes

Author: gribozavr

Foundation/NSFileManager.swift

@@ -801,38 +801,38 @@ public protocol NSFileManagerDelegate : class {
     /* fileManager:shouldProceedAfterError:copyingItemAtPath:toPath: gives the delegate an opportunity to recover from or continue copying after an error. If an error occurs, the error object will contain an NSError indicating the problem. The source path and destination paths are also provided. If this method returns YES, the NSFileManager instance will continue as if the error had not occurred. If this method returns NO, the NSFileManager instance will stop copying, return NO from copyItemAtPath:toPath:error: and the error will be provied there.
      */
     func fileManager(_ fileManager: NSFileManager, shouldProceedAfterError error: NSError, copyingItemAtPath srcPath: String, toPath dstPath: String) -> Bool
-    func fileManager(fileManager: NSFileManager, shouldProceedAfterError error: NSError, copyingItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldProceedAfterError error: NSError, copyingItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
 
     /* fileManager:shouldMoveItemAtPath:toPath: gives the delegate an opportunity to not move the item at the specified path. If the source path and the destination path are not on the same device, a copy is performed to the destination path and the original is removed. If the copy does not succeed, an error is returned and the incomplete copy is removed, leaving the original in place.
 
      */
-    func fileManager(fileManager: NSFileManager, shouldMoveItemAtPath srcPath: String, toPath dstPath: String) -> Bool
-    func fileManager(fileManager: NSFileManager, shouldMoveItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldMoveItemAtPath srcPath: String, toPath dstPath: String) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldMoveItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
 
     /* fileManager:shouldProceedAfterError:movingItemAtPath:toPath: functions much like fileManager:shouldProceedAfterError:copyingItemAtPath:toPath: above. The delegate has the opportunity to remedy the error condition and allow the move to continue.
      */
-    func fileManager(fileManager: NSFileManager, shouldProceedAfterError error: NSError, movingItemAtPath srcPath: String, toPath dstPath: String) -> Bool
-    func fileManager(fileManager: NSFileManager, shouldProceedAfterError error: NSError, movingItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldProceedAfterError error: NSError, movingItemAtPath srcPath: String, toPath dstPath: String) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldProceedAfterError error: NSError, movingItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
 
     /* fileManager:shouldLinkItemAtPath:toPath: acts as the other "should" methods, but this applies to the file manager creating hard links to the files in question.
      */
-    func fileManager(fileManager: NSFileManager, shouldLinkItemAtPath srcPath: String, toPath dstPath: String) -> Bool
-    func fileManager(fileManager: NSFileManager, shouldLinkItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldLinkItemAtPath srcPath: String, toPath dstPath: String) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldLinkItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
 
     /* fileManager:shouldProceedAfterError:linkingItemAtPath:toPath: allows the delegate an opportunity to remedy the error which occurred in linking srcPath to dstPath. If the delegate returns YES from this method, the linking will continue. If the delegate returns NO from this method, the linking operation will stop and the error will be returned via linkItemAtPath:toPath:error:.
      */
-    func fileManager(fileManager: NSFileManager, shouldProceedAfterError error: NSError, linkingItemAtPath srcPath: String, toPath dstPath: String) -> Bool
-    func fileManager(fileManager: NSFileManager, shouldProceedAfterError error: NSError, linkingItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldProceedAfterError error: NSError, linkingItemAtPath srcPath: String, toPath dstPath: String) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldProceedAfterError error: NSError, linkingItemAtURL srcURL: NSURL, toURL dstURL: NSURL) -> Bool
 
     /* fileManager:shouldRemoveItemAtPath: allows the delegate the opportunity to not remove the item at path. If the delegate returns YES from this method, the NSFileManager instance will attempt to remove the item. If the delegate returns NO from this method, the remove skips the item. If the item is a directory, no children of that item will be visited.
      */
-    func fileManager(fileManager: NSFileManager, shouldRemoveItemAtPath path: String) -> Bool
-    func fileManager(fileManager: NSFileManager, shouldRemoveItemAtURL URL: NSURL) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldRemoveItemAtPath path: String) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldRemoveItemAtURL URL: NSURL) -> Bool
 
     /* fileManager:shouldProceedAfterError:removingItemAtPath: allows the delegate an opportunity to remedy the error which occurred in removing the item at the path provided. If the delegate returns YES from this method, the removal operation will continue. If the delegate returns NO from this method, the removal operation will stop and the error will be returned via linkItemAtPath:toPath:error:.
      */
-    func fileManager(fileManager: NSFileManager, shouldProceedAfterError error: NSError, removingItemAtPath path: String) -> Bool
-    func fileManager(fileManager: NSFileManager, shouldProceedAfterError error: NSError, removingItemAtURL URL: NSURL) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldProceedAfterError error: NSError, removingItemAtPath path: String) -> Bool
+    func fileManager(_ fileManager: NSFileManager, shouldProceedAfterError error: NSError, removingItemAtURL URL: NSURL) -> Bool
 }
 
 public class NSDirectoryEnumerator : NSEnumerator {

Foundation/NSGeometry.swift

@@ -978,7 +978,7 @@ private extension NSCoder {
         self.encodeDouble(value.native, forKey: key)
     }
 
-    func _decodeCGFloatForKey(key: String) -> CGFloat {
+    func _decodeCGFloatForKey(_ key: String) -> CGFloat {
         return CGFloat(self.decodeDoubleForKey(key))
     }
 }

Foundation/NSKeyedUnarchiver.swift

@@ -176,7 +176,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Dereferences, but does not decode, an object reference
      */
-    private func _dereferenceObjectReference(unwrappedObjectRef: CFKeyedArchiverUID) -> Any? {
+    private func _dereferenceObjectReference(_ unwrappedObjectRef: CFKeyedArchiverUID) -> Any? {
         let uid = Int(objectRefGetValue(unwrappedObjectRef))
 
         guard uid < self._objects.count else {
@@ -204,7 +204,7 @@ public class NSKeyedUnarchiver : NSCoder {
         return true
     }
 
-    private static func _supportsSecureCoding(clsv : AnyClass) -> Bool {
+    private static func _supportsSecureCoding(_ clsv : AnyClass) -> Bool {
         if let secureCodable = clsv as? NSSecureCoding.Type {
             return secureCodable.supportsSecureCoding()
         }
@@ -213,7 +213,7 @@ public class NSKeyedUnarchiver : NSCoder {
     }
 
     // FIXME is there a better way to do this with Swift stdlib?
-    private static func _classIsKindOfClass(assertedClass : AnyClass, _ allowedClass : AnyClass) -> Bool {
+    private static func _classIsKindOfClass(_ assertedClass : AnyClass, _ allowedClass : AnyClass) -> Bool {
         var superClass : AnyClass? = assertedClass
 
         repeat {
@@ -227,7 +227,7 @@ public class NSKeyedUnarchiver : NSCoder {
         return false
     }
 
-    private func _isClassAllowed(assertedClass: AnyClass?, allowedClasses: [AnyClass]?) -> Bool {
+    private func _isClassAllowed(_ assertedClass: AnyClass?, allowedClasses: [AnyClass]?) -> Bool {
         if assertedClass == nil {
             return false
         }
@@ -248,12 +248,12 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Validate a dictionary with class type information, mapping to a class if allowed
      */ 
-    private func _validateAndMapClassDictionary(classDict: Dictionary<String, Any>?,
+    private func _validateAndMapClassDictionary(_ classDict: Dictionary<String, Any>?,
                                                 allowedClasses: [AnyClass]?,
                                                 classToConstruct: inout AnyClass?) -> Bool {
         classToConstruct = nil
 
-        func _classForClassName(codedName: String) -> AnyClass? {
+        func _classForClassName(_ codedName: String) -> AnyClass? {
             var aClass : AnyClass?
 
             aClass = classForClassName(codedName)
@@ -312,7 +312,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Validate a class reference against a class list, and return the class object if allowed
      */
-    private func _validateAndMapClassReference(classReference: CFKeyedArchiverUID,
+    private func _validateAndMapClassReference(_ classReference: CFKeyedArchiverUID,
                                                allowedClasses: [AnyClass]?) throws -> AnyClass? {
         let classUid = objectRefGetValue(classReference)
         var classToConstruct : AnyClass? = _classes[classUid]
@@ -337,26 +337,26 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Returns true if objectOrReference represents a reference to another object in the archive
      */
-    internal static func _isReference(objectOrReference : Any?) -> Bool {
+    internal static func _isReference(_ objectOrReference : Any?) -> Bool {
         if let cf = objectOrReference as? __NSCFType {
             return CFGetTypeID(cf) == _CFKeyedArchiverUIDGetTypeID()
         } else {
             return false
         }
     }
 
-    private func _cachedObjectForReference(objectRef: CFKeyedArchiverUID) -> AnyObject? {
+    private func _cachedObjectForReference(_ objectRef: CFKeyedArchiverUID) -> AnyObject? {
         return self._objRefMap[objectRefGetValue(objectRef)]
     }
 
-    private func _cacheObject(object: AnyObject, forReference objectRef: CFKeyedArchiverUID) {
+    private func _cacheObject(_ object: AnyObject, forReference objectRef: CFKeyedArchiverUID) {
         self._objRefMap[objectRefGetValue(objectRef)] = object
     }
 
     /**
         Returns true if the object is a dictionary representing a object rather than a value type
      */
-    private func _isContainer(object: Any) -> Bool {
+    private func _isContainer(_ object: Any) -> Bool {
         guard let dict = object as? Dictionary<String, Any> else {
             return false
         }
@@ -370,7 +370,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Replace object with another one
      */
-    private func replaceObject(object: AnyObject, withObject replacement: AnyObject) {
+    private func replaceObject(_ object: AnyObject, withObject replacement: AnyObject) {
         let oid = NSUniqueObject(object)
 
         if let unwrappedDelegate = self.delegate {
@@ -380,12 +380,12 @@ public class NSKeyedUnarchiver : NSCoder {
         self._replacementMap[oid] = replacement
     }
 
-    private func _decodingError(code: NSCocoaError, withDescription description: String) -> NSError {
+    private func _decodingError(_ code: NSCocoaError, withDescription description: String) -> NSError {
         return NSError(domain: NSCocoaErrorDomain,
                                code: code.rawValue, userInfo: [ "NSDebugDescription" : description ])
     }
 
-    private func _replacementObject(decodedObject: AnyObject?) -> AnyObject? {
+    private func _replacementObject(_ decodedObject: AnyObject?) -> AnyObject? {
         var object : AnyObject? = nil // object to encode after substitution
 
         // nil cannot be mapped
@@ -411,7 +411,7 @@ public class NSKeyedUnarchiver : NSCoder {
         return decodedObject
     }
 
-    private func _validateClassSupportsSecureCoding(classToConstruct : AnyClass?) -> Bool {
+    private func _validateClassSupportsSecureCoding(_ classToConstruct : AnyClass?) -> Bool {
         var supportsSecureCoding : Bool = false
 
         if let secureDecodableClass = classToConstruct as? NSSecureCoding.Type {
@@ -429,7 +429,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Decode an object for the given reference
      */
-    private func _decodeObject(objectRef: AnyObject) throws -> AnyObject? {
+    private func _decodeObject(_ objectRef: AnyObject) throws -> AnyObject? {
         var object : AnyObject? = nil
 
         _validateStillDecoding()
@@ -526,7 +526,7 @@ public class NSKeyedUnarchiver : NSCoder {
     /**
         Helper for NSArray/NSDictionary to dereference and decode an array of objects
      */
-    internal func _decodeArrayOfObjectsForKey(key: String,
+    internal func _decodeArrayOfObjectsForKey(_ key: String,
                                               @noescape withBlock block: (Any) -> Void) throws {
         let objectRefs : Array<Any>? = _decodeValue(forKey: key)
 
@@ -545,7 +545,7 @@ public class NSKeyedUnarchiver : NSCoder {
         }
     }
 
-    internal override func _decodeArrayOfObjectsForKey(key: String) -> [AnyObject] {
+    internal override func _decodeArrayOfObjectsForKey(_ key: String) -> [AnyObject] {
         var array : Array<AnyObject> = []
 
         do {
@@ -584,20 +584,20 @@ public class NSKeyedUnarchiver : NSCoder {
         self._flags.insert(UnarchiverFlags.FinishedDecoding)
     }
 
-    public class func setClass(cls: AnyClass?, forClassName codedName: String) {
+    public class func setClass(_ cls: AnyClass?, forClassName codedName: String) {
         _classNameMapLock.synchronized {
             _classNameMap[codedName] = cls
         }
     }
 
-    public func setClass(cls: AnyClass?, forClassName codedName: String) {
+    public func setClass(_ cls: AnyClass?, forClassName codedName: String) {
         _classNameMap[codedName] = cls
     }
 
     // During decoding, the coder first checks with the coder's
     // own table, then if there was no mapping there, the class's.
 
-    public class func classForClassName(codedName: String) -> AnyClass? {
+    public class func classForClassName(_ codedName: String) -> AnyClass? {
         var mappedClass : AnyClass?
 
         _classNameMapLock.synchronized {
@@ -607,16 +607,16 @@ public class NSKeyedUnarchiver : NSCoder {
         return mappedClass
     }
 
-    public func classForClassName(codedName: String) -> AnyClass? {
+    public func classForClassName(_ codedName: String) -> AnyClass? {
         return _classNameMap[codedName]
     }
 
-    public override func containsValueForKey(key: String) -> Bool {
+    public override func containsValueForKey(_ key: String) -> Bool {
         let any : Any? = _decodeValue(forKey: key)
         return any != nil
     }
 
-    public override func decodeObjectForKey(key: String) -> AnyObject? {
+    public override func decodeObjectForKey(_ key: String) -> AnyObject? {
         do {
             return try _decodeObject(forKey: key)
         } catch let error as NSError {
@@ -628,7 +628,7 @@ public class NSKeyedUnarchiver : NSCoder {
     }
 
     // private variant of decodeObjectOfClasses() that supports generic (unkeyed) objects
-    private func _decodeObjectOfClasses(classes: [AnyClass], forKey key: String? = nil) -> AnyObject? {
+    private func _decodeObjectOfClasses(_ classes: [AnyClass], forKey key: String? = nil) -> AnyObject? {
         do {
             self._allowedClasses.append(classes)
             defer { self._allowedClasses.removeLast() }