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

Merge pull request #64149 from hamishknight/more-nfc-changes

Browse Source
This commit is contained in:
Hamish Knight
2023-03-07 10:49:54 +00:00
committed by GitHub
parent 8e5044ae0a 2976edbe20
commit 43f0694fa3
24 changed files with 1582 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/CSSimplify.cpp
View File

@@ -9951,7 +9951,7 @@ static bool inferEnumMemberThroughTildeEqualsOperator(
cs.setType(EP, enumTy);
// result of ~= operator is always a `Bool`.
auto target = SolutionApplicationTarget::forExprPattern(
auto target = SyntacticElementTarget::forExprPattern(
matchCall, DC, EP, ctx.getBoolDecl()->getDeclaredInterfaceType());
DiagnosticTransaction diagnostics(ctx.Diags);
@@ -9980,7 +9980,7 @@ static bool inferEnumMemberThroughTildeEqualsOperator(
EP->setMatchVar(matchVar);
EP->setMatchExpr(matchCall);
cs.setSolutionApplicationTarget(pattern, target);
cs.setTargetFor(pattern, target);
return false;
}
@@ -11141,8 +11141,8 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,
}
}
SolutionApplicationTarget target(closure, contextualType);
setSolutionApplicationTarget(closure, target);
SyntacticElementTarget target(closure, contextualType);
setTargetFor(closure, target);
// Generate constraints from the body of this closure.
return !generateConstraints(AnyFunctionRef{closure}, closure->getBody());