Skip to content

Commit df7df7e

Browse files
ktosoktoso
authored
Merge pull request #75031 from Sajjon/cyon_typo_batch__test__concurrency
Typos: `test/concurrency`
2 parents df43b63 + 7074c29 commit df7df7e

6 files changed

+15
-15
lines changed

‎test/Concurrency/isolated_parameters.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ actor MyActor {
131131
func hello() {} // expected-typechecker-note {{calls to instance method 'hello()' from outside of its actor context are implicitly asynchronous}}
132132
}
133133

134-
// Compiler >= 5.3 is eneded to suppress the parser error
134+
// Compiler >= 5.3 is ended to suppress the parser error
135135
#if compiler(>=5.3) && ALLOW_TYPECHECKER_ERRORS
136136
typealias MyFn = (isolated: Int) -> Void // expected-typechecker-error {{function types cannot have argument labels; use '_' before 'isolated'}}
137137
#endif

‎test/Concurrency/sendable_objc_attr_in_type_context_swift5_strict.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ func test_sendable_attr_in_type_context(test: Test) {
103103

104104
_ = TestWithSendableID<SendableValue>() // Ok
105105

106-
// TOOD(diagnostics): Duplicate diagnostics
106+
// TODO(diagnostics): Duplicate diagnostics
107107
TestWithSendableID().add(MyValue())
108108
// expected-warning@-1 3 {{type 'MyValue' does not conform to the 'Sendable' protocol}}
109109

110110
TestWithSendableSuperclass().add(SendableMyValue()) // Ok
111111

112-
// TOOD(diagnostics): Duplicate diagnostics
112+
// TODO(diagnostics): Duplicate diagnostics
113113
TestWithSendableSuperclass().add(MyValue())
114114
// expected-warning@-1 3 {{type 'MyValue' does not conform to the 'Sendable' protocol}}
115115
}

‎test/Concurrency/sendable_objc_attr_in_type_context_swift6.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ func test_sendable_attr_in_type_context(test: Test) {
102102

103103
_ = TestWithSendableID<SendableValue>() // Ok
104104

105-
// TOOD(diagnostics): Duplicate diagnostics
105+
// TODO(diagnostics): Duplicate diagnostics
106106
TestWithSendableID().add(MyValue())
107107
// expected-error@-1 3 {{type 'MyValue' does not conform to the 'Sendable' protocol}}
108108

109109
TestWithSendableSuperclass().add(SendableMyValue()) // Ok
110110

111-
// TOOD(diagnostics): Duplicate diagnostics
111+
// TODO(diagnostics): Duplicate diagnostics
112112
TestWithSendableSuperclass().add(MyValue())
113113
// expected-error@-1 3 {{type 'MyValue' does not conform to the 'Sendable' protocol}}
114114
}

‎test/Concurrency/sending_mangling.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func testNoRemoveFunctionResultSubTypeResult() -> sending S<() -> sending NonSen
3232
// CHECK: sil hidden [ossa] @sending_mangling.testNoRemoveFunctionResultImmediateTypedFunctionWithArg() -> (sending __owned sending_mangling.NonSendableKlass) -> () : $@convention(thin) () -> @owned @callee_guaranteed (@sil_sending @owned NonSendableKlass) -> () {
3333
func testNoRemoveFunctionResultImmediateTypedFunctionWithArg() -> ((sending NonSendableKlass) -> ()) { fatalError() }
3434

35-
// CHECK: sil hidden [ossa] @sending_mangling.testNoRemoveFunctionResultImmedateTypedFunctionWithResult() -> () -> sending sending_mangling.NonSendableKlass : $@convention(thin) () -> @owned @callee_guaranteed () -> @sil_sending @owned NonSendableKlass {
36-
func testNoRemoveFunctionResultImmedateTypedFunctionWithResult() -> (() -> sending NonSendableKlass) { fatalError() }
35+
// CHECK: sil hidden [ossa] @sending_mangling.testNoRemoveFunctionResultImmediateTypedFunctionWithResult() -> () -> sending sending_mangling.NonSendableKlass : $@convention(thin) () -> @owned @callee_guaranteed () -> @sil_sending @owned NonSendableKlass {
36+
func testNoRemoveFunctionResultImmediateTypedFunctionWithResult() -> (() -> sending NonSendableKlass) { fatalError() }
3737

3838
struct MethodTest {
3939
// CHECK: sil hidden [ossa] @sending_mangling.MethodTest.init(__owned sending_mangling.NonSendableKlass) -> sending_mangling.MethodTest : $@convention(method) (@sil_sending @owned NonSendableKlass, @thin MethodTest.Type) -> MethodTest {
@@ -61,8 +61,8 @@ struct MethodTest {
6161
// CHECK: sil hidden [ossa] @sending_mangling.MethodTest.testNoRemoveFunctionResultImmediateTypedFunctionWithArg() -> (sending __owned sending_mangling.NonSendableKlass) -> () : $@convention(method) (MethodTest) -> @owned @callee_guaranteed (@sil_sending @owned NonSendableKlass) -> () {
6262
func testNoRemoveFunctionResultImmediateTypedFunctionWithArg() -> ((sending NonSendableKlass) -> ()) { fatalError() }
6363

64-
// CHECK: sil hidden [ossa] @sending_mangling.MethodTest.testNoRemoveFunctionResultImmedateTypedFunctionWithResult() -> () -> sending sending_mangling.NonSendableKlass : $@convention(method) (MethodTest) -> @owned @callee_guaranteed () -> @sil_sending @owned NonSendableKlass {
65-
func testNoRemoveFunctionResultImmedateTypedFunctionWithResult() -> (() -> sending NonSendableKlass) { fatalError() }
64+
// CHECK: sil hidden [ossa] @sending_mangling.MethodTest.testNoRemoveFunctionResultImmediateTypedFunctionWithResult() -> () -> sending sending_mangling.NonSendableKlass : $@convention(method) (MethodTest) -> @owned @callee_guaranteed () -> @sil_sending @owned NonSendableKlass {
65+
func testNoRemoveFunctionResultImmediateTypedFunctionWithResult() -> (() -> sending NonSendableKlass) { fatalError() }
6666
}
6767

6868
protocol SendingProtocol {
@@ -107,6 +107,6 @@ struct ConstructorSharedTest {
107107

108108
// This is a func which takes its parameter at +0 so we should suppress both.
109109
//
110-
// CHECK: sil hidden [ossa] @sending_mangling.ConstructorSharedTest.functionSupressed(sending_mangling.NonSendableKlass) -> () : $@convention(method) (@sil_sending @guaranteed NonSendableKlass, ConstructorSharedTest) -> () {
111-
func functionSupressed(_ x: __shared sending NonSendableKlass) {}
110+
// CHECK: sil hidden [ossa] @sending_mangling.ConstructorSharedTest.functionSuppressed(sending_mangling.NonSendableKlass) -> () : $@convention(method) (@sil_sending @guaranteed NonSendableKlass, ConstructorSharedTest) -> () {
111+
func functionSuppressed(_ x: __shared sending NonSendableKlass) {}
112112
}

‎test/Concurrency/transfernonsendable_closureliterals_isolationinference.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func useValue<T>(_ x: T) { }
121121

122122
@CustomActor
123123
func test_CallerSyncNormal_CalleeSyncNonIsolated() async {
124-
// Just to help start our pattern matchin since the closure #$NUM line
124+
// Just to help start our pattern matching since the closure #$NUM line
125125
// appears in other parts of the file.
126126
// CHECK-LABEL: } // end sil function '$s54transfernonsendable_closureliterals_isolationinference028test_CallerSyncNormal_CalleeF11NonIsolatedyyYaF'
127127

@@ -270,7 +270,7 @@ func test_CallerSyncInheritsActorContext_CalleeAsyncMainActorIsolated() async {
270270

271271
@CustomActor
272272
func test_CallerAsyncNormal_CalleeSyncNonIsolated() async {
273-
// Just to help start our pattern matchin since the closure #$NUM line
273+
// Just to help start our pattern matching since the closure #$NUM line
274274
// appears in other parts of the file.
275275
// CHECK-LABEL: } // end sil function '$s54transfernonsendable_closureliterals_isolationinference44test_CallerAsyncNormal_CalleeSyncNonIsolatedyyYaF'
276276

@@ -582,7 +582,7 @@ extension MyActor {
582582
extension MyActor {
583583

584584
func test_CallerAsyncNormal_CalleeSyncNonIsolated() async {
585-
// Just to help start our pattern matchin since the closure #$NUM line
585+
// Just to help start our pattern matching since the closure #$NUM line
586586
// appears in other parts of the file.
587587
// CHECK-LABEL: } // end sil function '$s54transfernonsendable_closureliterals_isolationinference7MyActorC44test_CallerAsyncNormal_CalleeSyncNonIsolatedyyYaF'
588588

‎test/Concurrency/transfernonsendable_sending_results.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func simpleTest() async {
7979
useValue(y)
8080
}
8181

82-
// Since y is transfered, we should emit the error on useValue(x). We generally
82+
// Since y is transferred, we should emit the error on useValue(x). We generally
8383
// emit the first seen error on a path, so if we were to emit an error on
8484
// useValue(y), we would have emitted that error.
8585
func simpleTest2() async {

0 commit comments

Comments
 (0)