Skip to content

Commit 5c71ba9

Browse files
ktosoktoso
committed
[TaskLocal] remove unnecessary awaits, trys, and rename tests
1 parent d7169ed commit 5c71ba9

File tree

4 files changed

+49
-49
lines changed

4 files changed

+49
-49
lines changed

‎test/Concurrency/Runtime/task_locals_async_let.swift renamed to ‎test/Concurrency/Runtime/async_task_locals_async_let.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func printTaskLocal<Key>(
2525
_ key: KeyPath<TaskLocalValues, Key>,
2626
_ expected: Key.Value? = nil,
2727
file: String = #file, line: UInt = #line
28-
) async throws -> Key.Value? where Key: TaskLocalKey {
28+
) -> Key.Value? where Key: TaskLocalKey {
2929
let value = Task.local(key)
3030
print("\(Key.self): \(value) at \(file):\(line)")
3131
if let expected = expected {
@@ -38,13 +38,13 @@ func printTaskLocal<Key>(
3838
// ==== ------------------------------------------------------------------------
3939

4040
func async_let_nested() async {
41-
_ = try! await printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
41+
_ = printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
4242
async let x1: () = Task.withLocal(\.number, boundTo: 2) {
4343
async let x2 = printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
4444

4545
@concurrent
4646
func test() async {
47-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
47+
printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
4848
async let x31 = printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
4949
_ = try! await x31
5050
}
@@ -55,7 +55,7 @@ func async_let_nested() async {
5555
}
5656

5757
_ = await x1
58-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
58+
printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
5959
}
6060

6161
func async_let_nested_skip_optimization() async {

‎test/Concurrency/Runtime/task_locals_basic.swift renamed to ‎test/Concurrency/Runtime/async_task_locals_basic.swift

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ final class ClassTaskLocal {
5151
func printTaskLocal<Key>(
5252
_ key: KeyPath<TaskLocalValues, Key>,
5353
_ expected: Key.Value? = nil,
54-
file: String = #file, line: UInt = #line
55-
) async throws where Key: TaskLocalKey {
56-
let value = Task.local(key)
54+
file: String = #file, line: UInt = #line, function: String = #function
55+
) where Key: TaskLocalKey {
56+
let value = Task.local(key, file: file, line: line, function: function)
5757
print("\(Key.self): \(value) at \(file):\(line)")
5858
if let expected = expected {
5959
assert("\(expected)" == "\(value)",
@@ -64,19 +64,19 @@ func printTaskLocal<Key>(
6464
// ==== ------------------------------------------------------------------------
6565

6666
func simple() async {
67-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
67+
printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
6868
await Task.withLocal(\.number, boundTo: 1) {
69-
try! await printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 1 {{.*}}
69+
printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 1 {{.*}}
7070
}
7171
}
7272

7373
func simple_deinit() async {
7474
await Task.withLocal(\.clazz, boundTo: ClassTaskLocal()) {
7575
// CHECK: clazz init [[C:.*]]
76-
try! await printTaskLocal(\.clazz) // CHECK: ClazzKey: Optional(main.ClassTaskLocal) {{.*}}
76+
printTaskLocal(\.clazz) // CHECK: ClazzKey: Optional(main.ClassTaskLocal) {{.*}}
7777
}
7878
// CHECK: clazz deinit [[C]]
79-
try! await printTaskLocal(\.clazz) // CHECK: ClazzKey: nil {{.*}}
79+
printTaskLocal(\.clazz) // CHECK: ClazzKey: nil {{.*}}
8080
}
8181

8282
struct Boom: Error {
@@ -94,51 +94,51 @@ func simple_throw() async {
9494
}
9595

9696
func nested() async {
97-
try! await printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
97+
printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
9898
await Task.withLocal(\.string, boundTo: "hello") {
99-
try! await printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 0 {{.*}}
100-
try! await printTaskLocal(\.string)// CHECK-NEXT: StringKey: hello {{.*}}
99+
printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 0 {{.*}}
100+
printTaskLocal(\.string)// CHECK-NEXT: StringKey: hello {{.*}}
101101
await Task.withLocal(\.number, boundTo: 2) {
102-
try! await printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 2 {{.*}}
103-
try! await printTaskLocal(\.string, "hello") // CHECK: StringKey: hello {{.*}}
102+
printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 2 {{.*}}
103+
printTaskLocal(\.string, "hello") // CHECK: StringKey: hello {{.*}}
104104
}
105-
try! await printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 0 {{.*}}
106-
try! await printTaskLocal(\.string) // CHECK-NEXT: StringKey: hello {{.*}}
105+
printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 0 {{.*}}
106+
printTaskLocal(\.string) // CHECK-NEXT: StringKey: hello {{.*}}
107107
}
108-
try! await printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 0 {{.*}}
109-
try! await printTaskLocal(\.string) // CHECK-NEXT: StringKey: <undefined> {{.*}}
108+
printTaskLocal(\.number) // CHECK-NEXT: NumberKey: 0 {{.*}}
109+
printTaskLocal(\.string) // CHECK-NEXT: StringKey: <undefined> {{.*}}
110110
}
111111

112112
func nested_allContribute() async {
113-
try! await printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
113+
printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
114114
await Task.withLocal(\.string, boundTo: "one") {
115-
try! await printTaskLocal(\.string, "one")// CHECK-NEXT: StringKey: one {{.*}}
115+
printTaskLocal(\.string, "one")// CHECK-NEXT: StringKey: one {{.*}}
116116
await Task.withLocal(\.string, boundTo: "two") {
117-
try! await printTaskLocal(\.string, "two") // CHECK-NEXT: StringKey: two {{.*}}
117+
printTaskLocal(\.string, "two") // CHECK-NEXT: StringKey: two {{.*}}
118118
await Task.withLocal(\.string, boundTo: "three") {
119-
try! await printTaskLocal(\.string, "three") // CHECK-NEXT: StringKey: three {{.*}}
119+
printTaskLocal(\.string, "three") // CHECK-NEXT: StringKey: three {{.*}}
120120
}
121-
try! await printTaskLocal(\.string, "two") // CHECK-NEXT: StringKey: two {{.*}}
121+
printTaskLocal(\.string, "two") // CHECK-NEXT: StringKey: two {{.*}}
122122
}
123-
try! await printTaskLocal(\.string, "one")// CHECK-NEXT: StringKey: one {{.*}}
123+
printTaskLocal(\.string, "one")// CHECK-NEXT: StringKey: one {{.*}}
124124
}
125-
try! await printTaskLocal(\.string) // CHECK-NEXT: StringKey: <undefined> {{.*}}
125+
printTaskLocal(\.string) // CHECK-NEXT: StringKey: <undefined> {{.*}}
126126
}
127127

128128
func nested_3_onlyTopContributes() async {
129-
try! await printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
129+
printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
130130
await Task.withLocal(\.string, boundTo: "one") {
131-
try! await printTaskLocal(\.string)// CHECK-NEXT: StringKey: one {{.*}}
131+
printTaskLocal(\.string)// CHECK-NEXT: StringKey: one {{.*}}
132132
await Task.withLocal(\.number, boundTo: 2) {
133-
try! await printTaskLocal(\.string) // CHECK-NEXT: StringKey: one {{.*}}
133+
printTaskLocal(\.string) // CHECK-NEXT: StringKey: one {{.*}}
134134
await Task.withLocal(\.number, boundTo: 3) {
135-
try! await printTaskLocal(\.string) // CHECK-NEXT: StringKey: one {{.*}}
135+
printTaskLocal(\.string) // CHECK-NEXT: StringKey: one {{.*}}
136136
}
137-
try! await printTaskLocal(\.string) // CHECK-NEXT: StringKey: one {{.*}}
137+
printTaskLocal(\.string) // CHECK-NEXT: StringKey: one {{.*}}
138138
}
139-
try! await printTaskLocal(\.string)// CHECK-NEXT: StringKey: one {{.*}}
139+
printTaskLocal(\.string)// CHECK-NEXT: StringKey: one {{.*}}
140140
}
141-
try! await printTaskLocal(\.string) // CHECK-NEXT: StringKey: <undefined> {{.*}}
141+
printTaskLocal(\.string) // CHECK-NEXT: StringKey: <undefined> {{.*}}
142142
}
143143

144144
func withLocal_body_mustNotEscape() async {

‎test/Concurrency/Runtime/task_locals_groups.swift renamed to ‎test/Concurrency/Runtime/async_task_locals_groups.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ func printTaskLocal<Key>(
4040
func groups() async {
4141
// no value
4242
try! await Task.withGroup(resultType: Int.self) { group in
43-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
43+
printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
4444
}
4545

4646
// no value in parent, value in child
4747
let x1: Int = try! await Task.withGroup(resultType: Int.self) { group in
4848
await group.add {
49-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
49+
printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
5050
// inside the child task, set a value
5151
await Task.withLocal(\.number, boundTo: 1) {
52-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 1 {{.*}}
52+
printTaskLocal(\.number) // CHECK: NumberKey: 1 {{.*}}
5353
}
54-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
54+
printTaskLocal(\.number) // CHECK: NumberKey: 0 {{.*}}
5555
return Task.local(\.number) // 0
5656
}
5757

@@ -61,19 +61,19 @@ func groups() async {
6161

6262
// value in parent and in groups
6363
await Task.withLocal(\.number, boundTo: 2) {
64-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
64+
printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
6565

6666
let x2: Int = try! await Task.withGroup(resultType: Int.self) { group in
67-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
67+
printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
6868
await group.add {
69-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
69+
printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
7070

7171
async let childInsideGroupChild = printTaskLocal(\.number)
7272
try! await childInsideGroupChild // CHECK: NumberKey: 2 {{.*}}
7373

7474
return Task.local(\.number)
7575
}
76-
try! await printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
76+
printTaskLocal(\.number) // CHECK: NumberKey: 2 {{.*}}
7777

7878
return try! await group.next()!
7979
}

‎test/Concurrency/Runtime/task_locals_inherit_never.swift renamed to ‎test/Concurrency/Runtime/async_task_locals_inherit_never.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,30 @@ extension TaskLocalValues {
4141
func test_async_let() async {
4242
print(#function) // CHECK: test_async_let
4343

44-
await printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
44+
printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
4545
await Task.withLocal(\.string, boundTo: "top") {
46-
await printTaskLocal(\.string) // CHECK: StringKey: top {{.*}}
46+
printTaskLocal(\.string) // CHECK: StringKey: top {{.*}}
4747

4848
async let child: () = printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
4949
await child
5050

51-
await printTaskLocal(\.string) // CHECK: StringKey: top {{.*}}
51+
printTaskLocal(\.string) // CHECK: StringKey: top {{.*}}
5252
}
5353
}
5454

5555
func test_async_group() async {
5656
// CHECK: test_async_group
5757
print(#function)
5858

59-
await printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
59+
printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
6060
await Task.withLocal(\.string, boundTo: "top") {
61-
await printTaskLocal(\.string) // CHECK: StringKey: top {{.*}}
61+
printTaskLocal(\.string) // CHECK: StringKey: top {{.*}}
6262

6363
try! await Task.withGroup(resultType: Void.self) { group -> Void? in
64-
await printTaskLocal(\.string) // CHECK: StringKey: top {{.*}}
64+
printTaskLocal(\.string) // CHECK: StringKey: top {{.*}}
6565

6666
await group.add {
67-
await printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
67+
printTaskLocal(\.string) // CHECK: StringKey: <undefined> {{.*}}
6868
}
6969

7070
return try! await group.next()

0 commit comments

Comments
 (0)