Merge branch 'master' into nscoder-doc

Author: parkera

Foundation/NSCoder.swift

@@ -682,7 +682,7 @@ open class NSCoder : NSObject {
     ///
     /// - Parameter key:    The coder key.
     /// - Returns:          A decoded object containing a property list.
-    open func decodePropertyListForKey(_ key: String) -> Any? {
+    open func decodePropertyList(forKey key: String) -> Any? {
         NSUnimplemented()
     }
 

Foundation/NSError.swift

@@ -222,9 +222,9 @@ public extension LocalizedError {
 /// NSErrorRecoveryAttempting, which is used by NSError when it
 /// attempts recovery from an error.
 class _NSErrorRecoveryAttempter {
-    func attemptRecovery(fromError nsError: NSError,
+    func attemptRecovery(fromError error: Error,
         optionIndex recoveryOptionIndex: Int) -> Bool {
-        let error = nsError as Error as! RecoverableError
+        let error = error as! RecoverableError
         return error.attemptRecovery(optionIndex: recoveryOptionIndex)
   }
 }

Foundation/NSGeometry.swift

@@ -41,14 +41,14 @@ extension CGPoint: NSSpecialValueCoding {
         guard aDecoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
         }
-        self = aDecoder.decodePointForKey("NS.pointval")
+        self = aDecoder.decodePoint(forKey: "NS.pointval")
     }
 
     func encodeWithCoder(_ aCoder: NSCoder) {
         guard aCoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
         }
-        aCoder.encodePoint(self, forKey: "NS.pointval")
+        aCoder.encode(self, forKey: "NS.pointval")
     }
 
     static func objCType() -> String {
@@ -104,14 +104,14 @@ extension CGSize: NSSpecialValueCoding {
         guard aDecoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
         }
-        self = aDecoder.decodeSizeForKey("NS.sizeval")
+        self = aDecoder.decodeSize(forKey: "NS.sizeval")
     }
 
     func encodeWithCoder(_ aCoder: NSCoder) {
         guard aCoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
         }
-        aCoder.encodeSize(self, forKey: "NS.sizeval")
+        aCoder.encode(self, forKey: "NS.sizeval")
     }
 
     static func objCType() -> String {
@@ -186,14 +186,14 @@ extension CGRect: NSSpecialValueCoding {
         guard aDecoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
         }
-        self = aDecoder.decodeRectForKey("NS.rectval")
+        self = aDecoder.decodeRect(forKey: "NS.rectval")
     }
 
     func encodeWithCoder(_ aCoder: NSCoder) {
         guard aCoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
         }
-        aCoder.encodeRect(self, forKey: "NS.rectval")
+        aCoder.encode(self, forKey: "NS.rectval")
     }
 
     static func objCType() -> String {
@@ -807,7 +807,7 @@ extension NSValue {
 
 extension NSCoder {
 
-    public func encodePoint(_ point: NSPoint) {
+    public func encode(_ point: NSPoint) {
         self._encodeCGFloat(point.x)
         self._encodeCGFloat(point.y)
     }
@@ -816,7 +816,7 @@ extension NSCoder {
         return NSPoint(x: _decodeCGFloat(), y: _decodeCGFloat())
     }
 
-    public func encodeSize(_ size: NSSize) {
+    public func encode(_ size: NSSize) {
         self._encodeCGFloat(size.width)
         self._encodeCGFloat(size.height)
     }
@@ -825,9 +825,9 @@ extension NSCoder {
         return NSSize(width: _decodeCGFloat(), height: _decodeCGFloat())
     }
 
-    public func encodeRect(_ rect: NSRect) {
-        self.encodePoint(rect.origin)
-        self.encodeSize(rect.size)
+    public func encode(_ rect: NSRect) {
+        self.encode(rect.origin)
+        self.encode(rect.size)
     }
 
     public func decodeRect() -> NSRect {
@@ -837,35 +837,35 @@ extension NSCoder {
 
 extension NSCoder {
 
-    public func encodePoint(_ point: NSPoint, forKey key: String) {
+    public func encode(_ point: NSPoint, forKey key: String) {
         self.encode(NSStringFromPoint(point)._bridgeToObjectiveC(), forKey: key)
     }
 
-    public func encodeSize(_ size: NSSize, forKey key: String) {
+    public func encode(_ size: NSSize, forKey key: String) {
         self.encode(NSStringFromSize(size)._bridgeToObjectiveC(), forKey: key)
     }
 
-    public func encodeRect(_ rect: NSRect, forKey key: String) {
+    public func encode(_ rect: NSRect, forKey key: String) {
         self.encode(NSStringFromRect(rect)._bridgeToObjectiveC(), forKey: key)
     }
 
-    public func decodePointForKey(_ key: String) -> NSPoint {
+    public func decodePoint(forKey key: String) -> NSPoint {
         if let string = self.decodeObject(of: NSString.self, forKey: key) {
             return NSPointFromString(String._unconditionallyBridgeFromObjectiveC(string))
         } else {
             return NSPoint()
         }
     }
 
-    public func decodeSizeForKey(_ key: String) -> NSSize {
+    public func decodeSize(forKey key: String) -> NSSize {
         if let string = self.decodeObject(of: NSString.self, forKey: key) {
             return NSSizeFromString(String._unconditionallyBridgeFromObjectiveC(string))
         } else {
             return NSSize()
         }
     }
 
-    public func decodeRectForKey(_ key: String) -> NSRect {
+    public func decodeRect(forKey key: String) -> NSRect {
         if let string = self.decodeObject(of: NSString.self, forKey: key) {
             return NSRectFromString(String._unconditionallyBridgeFromObjectiveC(string))
         } else {

Foundation/NSKeyedArchiver.swift

@@ -483,10 +483,10 @@ open class NSKeyedArchiver : NSCoder {
             return objectToEncode
         }
 
-        // object replaced by NSObject.replacementObjectForKeyedArchiver
+        // object replaced by NSObject.replacementObject(for:)
         // if it is replaced with nil, it cannot be further replaced
         if let ns = objectToEncode as? NSObject {
-            objectToEncode = ns.replacementObjectForKeyedArchiver(self)
+            objectToEncode = ns.replacementObject(for: self)
             if objectToEncode == nil {
                 replaceObject(object!, withObject: nil)
                 return nil
@@ -799,7 +799,7 @@ public protocol NSKeyedArchiverDelegate : class {
     // either returns this object or can return a different object to be encoded
     // instead.  The delegate can also fiddle with the coder state.  If the delegate
     // returns nil, nil is encoded.  This method is called after the original object
-    // may have replaced itself with replacementObjectForKeyedArchiver:.
+    // may have replaced itself with replacementObject(for:).
     // This method is not called for an object once a replacement mapping has been
     // setup for that object (either explicitly, or because the object has previously
     // been encoded).  This is also not called when nil is about to be encoded.

Foundation/NSKeyedUnarchiver.swift

@@ -669,12 +669,12 @@ open class NSKeyedUnarchiver : NSCoder {
         return _decodeObject(of: NSPropertyListClasses)
     }
 
-    open override func decodePropertyListForKey(_ key: String) -> Any? {
+    open override func decodePropertyList(forKey key: String) -> Any? {
         return decodeObject(of: NSPropertyListClasses, forKey:key)
     }
 
     /**
-        Note that unlike decodePropertyListForKey(), _decodePropertyListForKey() decodes
+        Note that unlike decodePropertyList(forKey:), _decodePropertyListForKey() decodes
         a property list in the current decoding context rather than as an object. It's
         also able to return value types.
      */
@@ -863,15 +863,9 @@ open class NSKeyedUnarchiver : NSCoder {
     }
 
     open class func unarchiveTopLevelObjectWithData(_ data: Data) throws -> Any? {
-        var root : Any? = nil
-        
         let keyedUnarchiver = NSKeyedUnarchiver(forReadingWithData: data)
-        do {
-            try root = keyedUnarchiver.decodeTopLevelObject(forKey: NSKeyedArchiveRootObjectKey)
-            keyedUnarchiver.finishDecoding()
-        } catch {
-        }
-        
+        let root = try keyedUnarchiver.decodeTopLevelObject(forKey: NSKeyedArchiveRootObjectKey)
+        keyedUnarchiver.finishDecoding()
         return root
     }
 }

Foundation/NSObject.swift

@@ -260,7 +260,7 @@ open class NSObject : NSObjectProtocol, Equatable, Hashable {
     ///
     /// - Parameter aCoder: The coder encoding the instance.
     /// - Returns:          The object encode instead of the instance (if different).
-    open func replacementObjectForCoder(_ aCoder: NSCoder) -> Any? {
+    open func replacementObject(for aCoder: NSCoder) -> Any? {
         return self
     }
 
@@ -284,8 +284,8 @@ open class NSObject : NSObjectProtocol, Equatable, Hashable {
     ///
     /// - Parameter archiver:   A keyed archiver creating an archive.
     /// - Returns:              The object encode instead of the instance (if different).
-    open func replacementObjectForKeyedArchiver(_ archiver: NSKeyedArchiver) -> Any? {
-        return self.replacementObjectForCoder(archiver)
+    open func replacementObject(for archiver: NSKeyedArchiver) -> Any? {
+        return self.replacementObject(for: archiver as NSCoder)
     }
 
     /// Overridden to return the names of classes that can be used to decode

Foundation/NSRunLoop.swift

@@ -33,14 +33,14 @@ public struct RunLoopMode : RawRepresentable, Equatable, Hashable, Comparable {
     public var hashValue: Int {
         return rawValue.hashValue
     }
-}
 
-public func ==(lhs: RunLoopMode, rhs: RunLoopMode) -> Bool {
-    return lhs.rawValue == rhs.rawValue
-}
+    public static func ==(_ lhs: RunLoopMode, _ rhs: RunLoopMode) -> Bool {
+        return lhs.rawValue == rhs.rawValue
+    }
 
-public func <(lhs: RunLoopMode, rhs: RunLoopMode) -> Bool {
-    return lhs.rawValue < rhs.rawValue
+    public static func <(_ lhs: RunLoopMode, _ rhs: RunLoopMode) -> Bool {
+        return lhs.rawValue < rhs.rawValue
+    }
 }