Skip to content

Commit d8185e7

Browse files
authored
Fix a few warnings (#2229)
Motivation: We should aim to keep warnings at zero. There were a few littered around as a result of Swift 6.1. Modifications: - Fix the warnings - Enabled warnings-as-errors in CI to avoid regressions Result: No warnings
1 parent c295efd commit d8185e7

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
with:
1414
linux_5_9_enabled: false
1515
linux_5_10_enabled: false
16-
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
17-
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
16+
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -warnings-as-errors"
17+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -warnings-as-errors"
1818
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1919
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2020

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
with:
2323
linux_5_9_enabled: false
2424
linux_5_10_enabled: false
25-
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
26-
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
25+
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -warnings-as-errors"
26+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -warnings-as-errors"
2727
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2828
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2929

Sources/GRPCCore/Call/Client/Internal/ClientRPCExecutor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ extension ClientRPCExecutor {
186186
}
187187
} catch let error as RPCError {
188188
return StreamingClientResponse(error: error)
189-
} catch let error as RPCErrorConvertible {
189+
} catch let error as any RPCErrorConvertible {
190190
return StreamingClientResponse(error: RPCError(error))
191191
} catch let other {
192192
let error = RPCError(code: .unknown, message: "", cause: other)

Sources/GRPCCore/Call/Server/Internal/ServerRPCExecutor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ extension ServerRPCExecutor {
330330
}
331331
} catch let error as RPCError {
332332
return StreamingServerResponse(error: error)
333-
} catch let error as RPCErrorConvertible {
333+
} catch let error as any RPCErrorConvertible {
334334
return StreamingServerResponse(error: RPCError(error))
335335
} catch let other {
336336
let error = RPCError(code: .unknown, message: "", cause: other)

Tests/GRPCCoreTests/Call/Server/ServerResponseTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct ServerResponseTests {
2727
trailingMetadata: ["metadata": "trailing"]
2828
)
2929

30-
let contents = try #require(try response.accepted.get())
30+
let contents = try response.accepted.get()
3131
#expect(contents.message == "message")
3232
#expect(contents.metadata == ["metadata": "initial"])
3333
#expect(contents.trailingMetadata == ["metadata": "trailing"])
@@ -55,7 +55,7 @@ struct ServerResponseTests {
5555
return ["metadata": "trailing"]
5656
}
5757

58-
let contents = try #require(try response.accepted.get())
58+
let contents = try response.accepted.get()
5959
#expect(contents.metadata == ["metadata": "initial"])
6060
let trailingMetadata = try await contents.producer(.failTestOnWrite())
6161
#expect(trailingMetadata == ["metadata": "trailing"])

Tests/GRPCCoreTests/GRPCClientTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ struct ClientTests {
431431
deserializer: IdentityDeserializer(),
432432
options: .defaults
433433
) { response in
434-
let message = try #require(try response.message)
434+
let message = try response.message
435435
#expect(message == Array("hello".utf8))
436436
}
437437

@@ -449,7 +449,7 @@ struct ClientTests {
449449
deserializer: IdentityDeserializer(),
450450
options: .defaults
451451
) { response in
452-
let message = try #require(try response.message)
452+
let message = try response.message
453453
#expect(message == Array("Hello, Swift!".utf8))
454454
}
455455

@@ -494,7 +494,7 @@ struct ClientTests {
494494
deserializer: IdentityDeserializer(),
495495
options: .defaults
496496
) { response in
497-
let message = try #require(try response.message)
497+
let message = try response.message
498498
#expect(message == Array("hello".utf8))
499499
}
500500

@@ -512,7 +512,7 @@ struct ClientTests {
512512
deserializer: IdentityDeserializer(),
513513
options: .defaults
514514
) { response in
515-
let message = try #require(try response.message)
515+
let message = try response.message
516516
#expect(message == Array("hello".utf8))
517517
}
518518

0 commit comments

Comments
 (0)