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

6
lib/Sema/CSApply.cpp
View File

@@ -1341,8 +1341,8 @@ namespace {
Expr *bridgeErrorToObjectiveC(Expr *value) {
auto &tc = cs.getTypeChecker();
// Use _bridgeErrorProtocolToNSError to conver to an NSError.
auto fn = tc.Context.getBridgeErrorProtocolToNSError(&tc);
// Use _bridgeErrorToNSError to conver to an NSError.
auto fn = tc.Context.getBridgeErrorToNSError(&tc);
SourceLoc loc = value->getLoc();
if (!fn) {
tc.diagnose(loc, diag::missing_nserror_bridging_function);
@@ -1360,7 +1360,7 @@ namespace {
if (tc.typeCheckExpressionShallow(call, dc))
return nullptr;
// The return type of _bridgeErrorProtocolToNSError is formally
// The return type of _bridgeErrorToNSError is formally
// 'AnyObject' to avoid stdlib-to-Foundation dependencies, but it's
// really NSError. Abuse CovariantReturnConversionExpr to fix this.
auto nsErrorDecl = tc.Context.getNSErrorDecl();