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

BooleanType => Boolean

Browse Source
This commit is contained in:
Maxim Moiseev
2015-11-05 14:15:52 -08:00
committed by Max Moiseev
parent 507b68315e
commit 2c95bb6d51
214 changed files with 350 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sema/CSApply.cpp
View File

@@ -5762,7 +5762,7 @@ bool ConstraintSystem::applySolutionFix(Expr *expr,
if (!resolved->getPath().empty()) {
// We allow OptionalToBoolean fixes with an opened type to refer to the
// BooleanType conformance.
// Boolean conformance.
if (fix.first.getKind() == FixKind::OptionalToBoolean &&
resolved->getPath().size() == 1 &&
resolved->getPath()[0].getKind() == ConstraintLocator::OpenedGeneric)
@@ -6436,7 +6436,7 @@ Solution::convertBooleanTypeToBuiltinI1(Expr *expr, ConstraintLocator *locator)
auto result = convertViaBuiltinProtocol(
*this, expr, locator,
tc.getProtocol(expr->getLoc(),
KnownProtocolKind::BooleanType),
KnownProtocolKind::Boolean),
tc.Context.Id_boolValue,
tc.Context.Id_getBuiltinLogicValue,
diag::condition_broken_proto,