Spelling constraints (#42548)

* spelling: availability

Signed-off-by: Josh Soref <[email protected]>

* spelling: conditional

Signed-off-by: Josh Soref <[email protected]>

* spelling: deferred

Signed-off-by: Josh Soref <[email protected]>

* spelling: disambiguate

Signed-off-by: Josh Soref <[email protected]>

* spelling: failed

Signed-off-by: Josh Soref <[email protected]>

* spelling: interferes

Signed-off-by: Josh Soref <[email protected]>

* spelling: magnify

Signed-off-by: Josh Soref <[email protected]>

* spelling: occurrences

Signed-off-by: Josh Soref <[email protected]>

* spelling: overload

Signed-off-by: Josh Soref <[email protected]>

* spelling: redeclarations

Signed-off-by: Josh Soref <[email protected]>

* spelling: simplification

Signed-off-by: Josh Soref <[email protected]>

* spelling: string

Signed-off-by: Josh Soref <[email protected]>

* spelling: the

Signed-off-by: Josh Soref <[email protected]>

Co-authored-by: Josh Soref <[email protected]>

Author: jsoref

test/Constraints/array_literal_local_array.swift

@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift
 
-// SR-9611: Array type locally interfers with array literals.
+// SR-9611: Array type locally interferes with array literals.
 struct Array { }
 
 func foo() {

test/Constraints/availability.swift

@@ -16,7 +16,7 @@ func f(c: C) {
   let _: C? = C(c)
 }
 
-// rdar://problem/60047439 - unable to disambiguite expression based on availablity
+// rdar://problem/60047439 - unable to disambiguate expression based on availability
 func test_contextual_member_with_availability() {
   struct A {
     static var foo: A = A()

test/Constraints/closures.swift

@@ -1071,11 +1071,11 @@ func rdar_74435602(error: Error?) {
 // SR-14280
 let _: (@convention(block) () -> Void)? = Bool.random() ? nil : {} // OK
 let _: (@convention(thin) () -> Void)? = Bool.random() ? nil : {} // OK
-let _: (@convention(c) () -> Void)? = Bool.random() ? nil : {} // OK on type checking, diagnostics are deffered to SIL
+let _: (@convention(c) () -> Void)? = Bool.random() ? nil : {} // OK on type checking, diagnostics are deferred to SIL
 
 let _: (@convention(block) () -> Void)? = Bool.random() ? {} : {} // OK
 let _: (@convention(thin) () -> Void)? = Bool.random() ? {} : {} // OK
-let _: (@convention(c) () -> Void)? = Bool.random() ? {} : {} // OK on type checking, diagnostics are deffered to SIL
+let _: (@convention(c) () -> Void)? = Bool.random() ? {} : {} // OK on type checking, diagnostics are deferred to SIL
 
 // Make sure that diagnostic is attached to the closure even when body is empty (implicitly returns `Void`)
 var emptyBodyMismatch: () -> Int {

test/Constraints/generics.swift

@@ -906,7 +906,7 @@ func rdar78781552() {
   }
 }
 
-// rdar://79757320 - failured to produce a diagnostic when unresolved dependent member is used in function result position
+// rdar://79757320 - failed to produce a diagnostic when unresolved dependent member is used in function result position
 
 protocol R_79757320 {
   associatedtype In

test/Constraints/implicit_double_cgfloat_conversion.swift

@@ -149,7 +149,7 @@ func test_narrowing_is_delayed(x: Double, y: CGFloat) {
   // CHECK: function_ref @$s34implicit_double_cgfloat_conversion25test_narrowing_is_delayed1x1yySd_12CoreGraphics7CGFloatVtF10overloadedL_yS2d_SdtF
   // CHECK: @$s34implicit_double_cgfloat_conversion25test_narrowing_is_delayed1x1yySd_12CoreGraphics7CGFloatVtF10overloadedL_yS2d_SdtF
   // CHECK: function_ref @$s12CoreGraphics7CGFloatVyACSdcf
-  let _: CGFloat = overloaded(x, overloaded(x, y)) // Prefers `overloaded(Double, Double) -> Double` in both occurances.
+  let _: CGFloat = overloaded(x, overloaded(x, y)) // Prefers `overloaded(Double, Double) -> Double` in both occurrences.
 
   // Calls should behave exactly the same as contextual conversions.
 

test/Constraints/keypath_dynamic_member_lookup.swift

@@ -287,7 +287,7 @@ func prefer_readonly_keypath_over_reference_writable() {
 }
 
 
-// rdar://problem/52779809 - condiitional conformance shadows names of members reachable through dynamic lookup
+// rdar://problem/52779809 - conditional conformance shadows names of members reachable through dynamic lookup
 
 protocol P {
   var foo: Int { get }

test/Constraints/members.swift

@@ -688,7 +688,7 @@ func testSR13359(_ pair: (Int, Int), _ alias: Pair, _ void: Void, labeled: (a: I
   _ = pair[1] // expected-error {{cannot access element using subscript for tuple type '(Int, Int)'; did you mean to use '.1'?}} {{11-14=.1}}
   _ = pair[2] // expected-error {{cannot access element using subscript for tuple type '(Int, Int)'; use '.' notation instead}} {{none}}
   _ = pair[100] // expected-error {{cannot access element using subscript for tuple type '(Int, Int)'; use '.' notation instead}} {{none}}
-  _ = pair["strting"] // expected-error {{cannot access element using subscript for tuple type '(Int, Int)'; use '.' notation instead}} {{none}}
+  _ = pair["string"] // expected-error {{cannot access element using subscript for tuple type '(Int, Int)'; use '.' notation instead}} {{none}}
   _ = pair[-1] // expected-error {{cannot access element using subscript for tuple type '(Int, Int)'; use '.' notation instead}} {{none}}
   _ = pair[1, 1] // expected-error {{cannot access element using subscript for tuple type '(Int, Int)'; use '.' notation instead}} {{none}}
   _ = void[0] // expected-error {{value of type 'Void' has no subscripts}}
@@ -700,7 +700,7 @@ func testSR13359(_ pair: (Int, Int), _ alias: Pair, _ void: Void, labeled: (a: I
   _ = alias[1] // expected-error {{cannot access element using subscript for tuple type 'Pair' (aka '(Int, Int)'); did you mean to use '.1'?}} {{12-15=.1}}
   _ = alias[2] // expected-error {{cannot access element using subscript for tuple type 'Pair' (aka '(Int, Int)'); use '.' notation instead}} {{none}}
   _ = alias[100] // expected-error {{cannot access element using subscript for tuple type 'Pair' (aka '(Int, Int)'); use '.' notation instead}} {{none}}
-  _ = alias["strting"] // expected-error {{cannot access element using subscript for tuple type 'Pair' (aka '(Int, Int)'); use '.' notation instead}} {{none}}
+  _ = alias["string"] // expected-error {{cannot access element using subscript for tuple type 'Pair' (aka '(Int, Int)'); use '.' notation instead}} {{none}}
   _ = alias[-1] // expected-error {{cannot access element using subscript for tuple type 'Pair' (aka '(Int, Int)'); use '.' notation instead}} {{none}}
   _ = alias[1, 1] // expected-error {{cannot access element using subscript for tuple type 'Pair' (aka '(Int, Int)'); use '.' notation instead}} {{none}}
   _ = alias[0x00] // expected-error {{cannot access element using subscript for tuple type 'Pair' (aka '(Int, Int)'); use '.' notation instead}} {{none}}
@@ -711,7 +711,7 @@ func testSR13359(_ pair: (Int, Int), _ alias: Pair, _ void: Void, labeled: (a: I
   _ = labeled[1] // expected-error {{cannot access element using subscript for tuple type '(a: Int, b: Int)'; did you mean to use '.1'?}} {{14-17=.1}}
   _ = labeled[2] // expected-error {{cannot access element using subscript for tuple type '(a: Int, b: Int)'; use '.' notation instead}} {{none}}
   _ = labeled[100] // expected-error {{cannot access element using subscript for tuple type '(a: Int, b: Int)'; use '.' notation instead}} {{none}}
-  _ = labeled["strting"] // expected-error {{cannot access element using subscript for tuple type '(a: Int, b: Int)'; use '.' notation instead}} {{none}}
+  _ = labeled["string"] // expected-error {{cannot access element using subscript for tuple type '(a: Int, b: Int)'; use '.' notation instead}} {{none}}
   _ = labeled[-1] // expected-error {{cannot access element using subscript for tuple type '(a: Int, b: Int)'; use '.' notation instead}} {{none}}
   _ = labeled[1, 1] // expected-error {{cannot access element using subscript for tuple type '(a: Int, b: Int)'; use '.' notation instead}} {{none}}
   _ = labeled[0x00] // expected-error {{cannot access element using subscript for tuple type '(a: Int, b: Int)'; use '.' notation instead}} {{none}}

test/Constraints/opened_existentials.swift

@@ -202,7 +202,7 @@ func testTakeValueAndClosure(p: any P) {
   takeValueAndClosure(p, body: overloadedGenericFunctionTakingP)
   takeValueAndClosure(p, body: genericFunctionTakingPQ) // expected-error{{global function 'genericFunctionTakingPQ' requires that 'T' conform to 'Q'}}
 
-  // Do not allow opening if there are any uses of the the type parameter before
+  // Do not allow opening if there are any uses of the type parameter before
   // the opened parameter. This maintains left-to-right evaluation order.
   takeValueAndClosureBackwards( // expected-error{{type 'any P' cannot conform to 'P'}}
     // expected-note@-1{{only concrete types such as structs, enums and classes can conform to protocols}}

test/Constraints/overload_filtering.swift

@@ -42,7 +42,7 @@ func testUnresolvedMember(i: Int) -> X {
 func test_member_filtering() {
   struct S {
     // Result types here are different intentionally,
-    // if there were the same simplication logic would
+    // if there were the same simplification logic would
     // trigger and disable overloads during constraint
     // generation.
     func foo(_: Int) -> S { S() }

test/Constraints/result_builder_diags.swift

@@ -801,7 +801,7 @@ func test_missing_member_in_optional_context() {
   }
 }
 
-func test_redeclations() {
+func test_redeclarations() {
   tuplify(true) { c in
     let foo = 0 // expected-note {{'foo' previously declared here}}
     let foo = foo // expected-error {{invalid redeclaration of 'foo'}}

test/Constraints/tuple.swift

@@ -195,9 +195,9 @@ struct Victory<General> {
 struct MagicKingdom<K> : Kingdom {
   typealias King = K
 }
-func magify<T>(_ t: T) -> MagicKingdom<T> { return MagicKingdom() }
+func magnify<T>(_ t: T) -> MagicKingdom<T> { return MagicKingdom() }
 func foo(_ pair: (Int, Int)) -> Victory<(x: Int, y: Int)> {
-  return Victory(magify(pair)) // expected-error {{initializer 'init(_:)' requires the types '(x: Int, y: Int)' and 'MagicKingdom<(Int, Int)>.King' (aka '(Int, Int)') be equivalent}}
+  return Victory(magnify(pair)) // expected-error {{initializer 'init(_:)' requires the types '(x: Int, y: Int)' and 'MagicKingdom<(Int, Int)>.King' (aka '(Int, Int)') be equivalent}}
 }
 
 

test/Constraints/tuple_arguments.swift

@@ -1673,7 +1673,7 @@ public extension Optional {
 
 // https://bugs.swift.org/browse/SR-6837
 
-// FIXME: Can't overlaod local functions so these must be top-level
+// FIXME: Can't overload local functions so these must be top-level
 func takePairOverload(_ pair: (Int, Int?)) {}
 func takePairOverload(_: () -> ()) {}