Rename ErrorType to ErrorProtocol

This commit is contained in:
Dmitri Gribenko
2015-11-03 18:58:39 -08:00
committed by Max Moiseev
parent 99d3f96c6d
commit feacbc4433
123 changed files with 1121 additions and 1118 deletions

View File

@@ -1045,14 +1045,14 @@ extension CGRectEdge {
public typealias NSErrorPointer = AutoreleasingUnsafeMutablePointer<NSError?>
@warn_unused_result
@_silgen_name("swift_convertNSErrorToErrorType")
@_silgen_name("swift_convertNSErrorToErrorProtocol")
public // COMPILER_INTRINSIC
func _convertNSErrorToErrorType(error: NSError?) -> ErrorType
func _convertNSErrorToErrorProtocol(error: NSError?) -> ErrorProtocol
@warn_unused_result
@_silgen_name("swift_convertErrorTypeToNSError")
@_silgen_name("swift_convertErrorProtocolToNSError")
public // COMPILER_INTRINSIC
func _convertErrorTypeToNSError(error: ErrorType) -> NSError
func _convertErrorProtocolToNSError(error: ErrorProtocol) -> NSError
//===----------------------------------------------------------------------===//
// Variadic initializers and methods