Skip to content

Commit 9d50122

Browse files
committed
[ConstraintSystem] NFC: Fix typo in FixKind::AddConformance name
1 parent f15e17a commit 9d50122

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

lib/Sema/CSApply.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7971,7 +7971,7 @@ bool ConstraintSystem::applySolutionFix(
79717971
(!resolved->getPath().empty() &&
79727972
fix.first.getKind() != FixKind::ExplicitlyEscaping &&
79737973
fix.first.getKind() != FixKind::ExplicitlyEscapingToAny &&
7974-
fix.first.getKind() != FixKind::AddConformace))
7974+
fix.first.getKind() != FixKind::AddConformance))
79757975
return false;
79767976

79777977
Expr *affected = resolved->getAnchor();
@@ -8150,7 +8150,7 @@ bool ConstraintSystem::applySolutionFix(
81508150
isa<SubscriptExpr>(call->getFn()));
81518151
}
81528152

8153-
case FixKind::AddConformace: {
8153+
case FixKind::AddConformance: {
81548154
auto getMissingConformance = [&](ConstraintLocator *locator) {
81558155
auto *anchor = locator->getAnchor();
81568156
auto &requirement = locator->getPath().back();

lib/Sema/CSSimplify.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2783,7 +2783,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
27832783
// diagnostics only care about anchor - to lookup type,
27842784
// and what was the requirement# which is not satisfied.
27852785
ConstraintLocatorBuilder requirement(getConstraintLocator(anchor));
2786-
if (!recordFix({FixKind::AddConformace},
2786+
if (!recordFix({FixKind::AddConformance},
27872787
requirement.withPathElement(typeRequirement)))
27882788
return SolutionKind::Solved;
27892789
}
@@ -5013,7 +5013,7 @@ ConstraintSystem::simplifyFixConstraint(Fix fix, Type type1, Type type2,
50135013
case FixKind::ExplicitlyEscapingToAny:
50145014
case FixKind::CoerceToCheckedCast:
50155015
case FixKind::RelabelArguments:
5016-
case FixKind::AddConformace:
5016+
case FixKind::AddConformance:
50175017
llvm_unreachable("handled elsewhere");
50185018
}
50195019

lib/Sema/Constraint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ StringRef Fix::getName(FixKind kind) {
542542
return "fix: add @escaping";
543543
case FixKind::RelabelArguments:
544544
return "fix: re-label argument(s)";
545-
case FixKind::AddConformace:
545+
case FixKind::AddConformance:
546546
return "fix: add missing protocol conformance";
547547
}
548548

lib/Sema/Constraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ enum class FixKind : uint8_t {
255255
RelabelArguments,
256256

257257
/// Add a new conformance to the type to satisfy a requirement.
258-
AddConformace,
258+
AddConformance,
259259
};
260260

261261
/// Describes a fix that can be applied to a constraint before visiting it.

0 commit comments

Comments
 (0)