Skip to content

Commit 3f10bfa

Browse files
committed
[Diagnostics] NFC: Rename diagnoseConflictingArguments into diagnoseConflictingGenericArguments
1 parent 4d5c676 commit 3f10bfa

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/Sema/ConstraintSystem.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2771,9 +2771,9 @@ std::string swift::describeGenericType(ValueDecl *GP, bool includeName) {
27712771
///
27722772
/// It's done by first retrieving all generic parameters from each solution,
27732773
/// filtering boundings into distrinct set and diagnosing any differences.
2774-
static bool diagnoseConflictingArguments(ConstraintSystem &cs,
2775-
const SolutionDiff &diff,
2776-
ArrayRef<Solution> solutions) {
2774+
static bool diagnoseConflictingGenericArguments(ConstraintSystem &cs,
2775+
const SolutionDiff &diff,
2776+
ArrayRef<Solution> solutions) {
27772777
if (!diff.overloads.empty())
27782778
return false;
27792779

@@ -2899,7 +2899,7 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
28992899

29002900
SolutionDiff solutionDiff(solutions);
29012901

2902-
if (diagnoseConflictingArguments(*this, solutionDiff, solutions))
2902+
if (diagnoseConflictingGenericArguments(*this, solutionDiff, solutions))
29032903
return true;
29042904

29052905
// Collect aggregated fixes from all solutions

0 commit comments

Comments
 (0)