Skip to content

Commit 60a210b

Browse files
committed
[ConstraintSystem] NFC: Fix a couple of typos in comments
1 parent 3f10bfa commit 60a210b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/Sema/ConstraintSystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2770,7 +2770,7 @@ std::string swift::describeGenericType(ValueDecl *GP, bool includeName) {
27702770
/// }
27712771
///
27722772
/// It's done by first retrieving all generic parameters from each solution,
2773-
/// filtering boundings into distrinct set and diagnosing any differences.
2773+
/// filtering bindings into a distinct set and diagnosing any differences.
27742774
static bool diagnoseConflictingGenericArguments(ConstraintSystem &cs,
27752775
const SolutionDiff &diff,
27762776
ArrayRef<Solution> solutions) {

test/type/opaque.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func associatedTypeIdentity() {
273273
sameType(cr, dr) // expected-error {{conflicting arguments to generic parameter 'T' ('(some R).S' (associated type of protocol 'R') vs. '(some R).S' (associated type of protocol 'R'))}}
274274
sameType(gary(candace()).r_out(), gary(candace()).r_out())
275275
sameType(gary(doug()).r_out(), gary(doug()).r_out())
276-
// TODO(diagnostics): This is not great but we the problem comes from the way solver discovers and attempts bindings, if we could detect that
276+
// TODO(diagnostics): This is not great but the problem comes from the way solver discovers and attempts bindings, if we could detect that
277277
// `(some R).S` from first reference to `gary()` in incosistent with the second one based on the parent type of `S` it would be much easier to diagnose.
278278
sameType(gary(doug()).r_out(), gary(candace()).r_out())
279279
// expected-error@-1:3 {{conflicting arguments to generic parameter 'T' ('(some R).S' (associated type of protocol 'R') vs. '(some R).S' (associated type of protocol 'R'))}}

0 commit comments

Comments
 (0)