averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SE-0112] Rename ErrorProtocol to Error.

Browse Source 
This is bullet (5) of the proposed solution in SE-0112, and the last
major piece to be implemented.
This commit is contained in:
Doug Gregor
2016-07-08 13:53:49 -07:00
parent fcd5d07c20
commit 823c24b355
257 changed files with 1416 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/public/SDK/Foundation/Foundation.swift
View File

@@ -971,21 +971,21 @@ public typealias NSErrorPointer = AutoreleasingUnsafeMutablePointer<NSError?>?
public typealias ErrorPointer = NSErrorPointer
public // COMPILER_INTRINSIC
let _nilObjCError: ErrorProtocol = _GenericObjCError.nilError
let _nilObjCError: Error = _GenericObjCError.nilError
@_silgen_name("swift_convertNSErrorToErrorProtocol")
@_silgen_name("swift_convertNSErrorToError")
public // COMPILER_INTRINSIC
func _convertNSErrorToErrorProtocol(_ error: NSError?) -> ErrorProtocol {
func _convertNSErrorToError(_ error: NSError?) -> Error {
if let error = error {
return error
}
return _nilObjCError
}
@_silgen_name("swift_convertErrorProtocolToNSError")
@_silgen_name("swift_convertErrorToNSError")
public // COMPILER_INTRINSIC
func _convertErrorProtocolToNSError(_ error: ErrorProtocol) -> NSError {
return unsafeDowncast(_bridgeErrorProtocolToNSError(error), to: NSError.self)
func _convertErrorToNSError(_ error: Error) -> NSError {
return unsafeDowncast(_bridgeErrorToNSError(error), to: NSError.self)
}
//===----------------------------------------------------------------------===//