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-0289] Finish renaming source code, tests to "result builders"

Browse Source
This commit is contained in:
Doug Gregor
2020-10-20 22:18:51 -07:00
parent 0d568a93d4
commit 6d41524fe6
49 changed files with 313 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Sema/CSSimplify.cpp
View File

@@ -4494,7 +4494,7 @@ bool ConstraintSystem::repairFailures(
getConstraintLocator(anchor, path));
}
case ConstraintLocator::FunctionBuilderBodyResult: {
case ConstraintLocator::ResultBuilderBodyResult: {
// If result type of the body couldn't be determined
// there is going to be other fix available to diagnose
// the underlying issue.
@@ -7594,7 +7594,7 @@ ConstraintSystem::simplifyOneWayConstraint(
secondSimplified, first, ConstraintKind::BindParam, flags, locator);
}
static Type getOpenedFunctionBuilderTypeFor(ConstraintSystem &cs,
static Type getOpenedResultBuilderTypeFor(ConstraintSystem &cs,
ConstraintLocatorBuilder locator) {
auto lastElt = locator.last();
if (!lastElt)
@@ -7620,7 +7620,7 @@ static Type getOpenedFunctionBuilderTypeFor(ConstraintSystem &cs,
return Type();
auto *PD = getParameterAt(choice, argToParamElt->getParamIdx());
auto builderType = PD->getFunctionBuilderType();
auto builderType = PD->getResultBuilderType();
if (!builderType)
return Type();
@@ -7658,14 +7658,14 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,
auto *inferredClosureType = getClosureType(closure);
// Determine whether a result builder will be applied.
auto functionBuilderType = getOpenedFunctionBuilderTypeFor(*this, locator);
auto resultBuilderType = getOpenedResultBuilderTypeFor(*this, locator);
// Determine whether to introduce one-way constraints between the parameter's
// type as seen in the body of the closure and the external parameter
// type.
bool oneWayConstraints =
getASTContext().TypeCheckerOpts.EnableOneWayClosureParameters ||
functionBuilderType;
resultBuilderType;
auto *paramList = closure->getParameters();
SmallVector<AnyFunctionType::Param, 4> parameters;
@@ -7731,9 +7731,9 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,
assignFixedType(typeVar, closureType, closureLocator);
// If there is a result builder to apply, do so now.
if (functionBuilderType) {
if (auto result = matchFunctionBuilder(
closure, functionBuilderType, closureType->getResult(),
if (resultBuilderType) {
if (auto result = matchResultBuilder(
closure, resultBuilderType, closureType->getResult(),
ConstraintKind::Conversion, locator)) {
return result->isSuccess();
}
@@ -10131,7 +10131,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
case FixKind::RemoveAddressOf:
case FixKind::AddMissingArguments:
case FixKind::MoveOutOfOrderArgument:
case FixKind::SkipUnhandledConstructInFunctionBuilder:
case FixKind::SkipUnhandledConstructInResultBuilder:
case FixKind::UsePropertyWrapper:
case FixKind::UseWrappedValue:
case FixKind::ExpandArrayIntoVarargs:
@@ -10146,7 +10146,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
case FixKind::SpecifyKeyPathRootType:
case FixKind::SpecifyLabelToAssociateTrailingClosure:
case FixKind::AllowKeyPathWithoutComponents:
case FixKind::IgnoreInvalidFunctionBuilderBody:
case FixKind::IgnoreInvalidResultBuilderBody:
case FixKind::SpecifyContextualTypeForNil: {
return recordFix(fix) ? SolutionKind::Error : SolutionKind::Solved;
}
@@ -10376,7 +10376,7 @@ ConstraintSystem::addArgumentConversionConstraintImpl(
if (argTypeVar->getImpl().isClosureType()) {
// Extract any type variables present in the parameter's result builder.
SmallVector<TypeVariableType *, 4> typeVars;
if (auto builderTy = getOpenedFunctionBuilderTypeFor(*this, locator))
if (auto builderTy = getOpenedResultBuilderTypeFor(*this, locator))
builderTy->getTypeVariables(typeVars);
auto *loc = getConstraintLocator(locator);