Merge pull request swiftlang#446 from apple/nserror-bridging

Update for SE-0112: Rename ErrorProtocol to Error

Author: DougGregor

Foundation/FoundationErrors.swift

@@ -7,7 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-public struct NSCocoaError : RawRepresentable, ErrorProtocol, __BridgedNSError {
+public struct NSCocoaError : RawRepresentable, Swift.Error, __BridgedNSError {
     public let rawValue: Int
     public init(rawValue: Int) {
         self.rawValue = rawValue

Foundation/IndexSet.swift

@@ -634,7 +634,7 @@ public struct IndexSet : ReferenceConvertible, Equatable, BidirectionalCollectio
     public func filteredIndexSet(in range : Range<Element>? = nil, includeInteger: @noescape (Element) throws -> Bool) rethrows -> IndexSet {
         let r : NSRange = range != nil ? _toNSRange(range!) : NSMakeRange(0, NSNotFound - 1)
         return try _handle.map {
-            var error : ErrorProtocol? = nil
+            var error : Swift.Error? = nil
             let result = $0.indexes(in: r, options: [], passingTest: { (i, stop) -> Bool in
                 do {
                     let include = try includeInteger(i)

Foundation/NSData.swift

@@ -553,7 +553,7 @@ extension NSData {
     }
 
     internal func enumerateByteRangesUsingBlockRethrows(_ block: @noescape (UnsafePointer<Void>, NSRange, UnsafeMutablePointer<Bool>) throws -> Void) throws {
-        var err : ErrorProtocol? = nil
+        var err : Swift.Error? = nil
         self.enumerateBytes() { (buf, range, stop) -> Void in
             do {
                 try block(buf, range, stop)

Foundation/NSError.swift

@@ -165,7 +165,7 @@ public class NSError : NSObject, NSCopying, NSSecureCoding, NSCoding {
     }
 }
 
-extension NSError : ErrorProtocol { }
+extension NSError : Swift.Error { }
 
 extension NSError : _CFBridgable { }
 extension CFError : _NSBridgable {
@@ -184,11 +184,11 @@ extension CFError : _NSBridgable {
 }
 
 
-public protocol _ObjectTypeBridgeableErrorType : ErrorProtocol {
+public protocol _ObjectTypeBridgeableErrorType : Swift.Error {
     init?(_bridgedNSError: NSError)
 }
 
-public protocol __BridgedNSError : RawRepresentable, ErrorProtocol {
+public protocol __BridgedNSError : RawRepresentable, Swift.Error {
     static var __NSErrorDomain: String { get }
 }
 

Foundation/NSUserDefaults.swift

@@ -119,7 +119,7 @@ public class UserDefaults: NSObject {
         }
         //This got out of hand fast...
         let cVal = bVal._swiftObject
-        enum convErr: ErrorProtocol {
+        enum convErr: Swift.Error {
             case convErr
         }
         do {

TestFoundation/TestNSRange.swift

@@ -66,4 +66,4 @@ class TestNSRange : XCTestCase {
         let swiftRange2 = range.toRange()
         XCTAssertEqual(swiftRange, swiftRange2)
     }
-}
+}

TestFoundation/TestNSString.swift

@@ -1063,7 +1063,7 @@ let comparisonTests = [
     ComparisonTest("\u{0341}", "\u{0954}"),
 ]
 
-enum Stack: ErrorProtocol {
+enum Stack: Swift.Error {
     case Stack([UInt])
 }
 

TestFoundation/TestNSTask.swift

@@ -261,7 +261,7 @@ private func mkstemp(template: String, body: @noescape (FileHandle) throws -> Vo
 
 }
 
-private enum Error: ErrorProtocol {
+private enum Error: Swift.Error {
     case TerminationStatus(Int32)
     case UnicodeDecodingError(Data)
     case InvalidEnvironmentVariable(String)

Tools/plutil/main.swift

@@ -59,7 +59,7 @@ struct Options {
     var inputs = [String]()
 }
 
-enum OptionParseError : ErrorProtocol {
+enum OptionParseError : Swift.Error {
     case UnrecognizedArgument(String)
     case MissingArgument(String)
     case InvalidFormat(String)