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

Rename '_ErrorType' to 'ErrorType'.

Browse Source 
Swift SVN r28293
This commit is contained in:
Ted Kremenek
2015-05-07 21:59:29 +00:00
parent 8b392eeea9
commit 9f9bb725cf
50 changed files with 276 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sema/CSSimplify.cpp
View File

@@ -1826,7 +1826,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, TypeMatchKind kind,
}
// Bridging from an ErrorType to an Objective-C NSError.
auto errorType = TC.Context.getProtocol(KnownProtocolKind::_ErrorType);
auto errorType = TC.Context.getProtocol(KnownProtocolKind::ErrorType);
if (TC.conformsToProtocol(type1, errorType, DC,
ConformanceCheckFlags::InExpression))
if (auto NSErrorTy = TC.getNSErrorType(DC))
@@ -4222,7 +4222,7 @@ ConstraintSystem::simplifyRestrictedConstraint(ConversionRestrictionKind restric
increaseScore(SK_UserConversion); // FIXME: Use separate score kind?
// The input type must be an ErrorType subtype.
auto errorType = TC.Context.getProtocol(KnownProtocolKind::_ErrorType)
auto errorType = TC.Context.getProtocol(KnownProtocolKind::ErrorType)
->getDeclaredType();
return matchTypes(type1, errorType, TypeMatchKind::Subtype, subFlags,
locator);