Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
with:
linux_5_9_enabled: false
linux_5_10_enabled: false
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -warnings-as-errors"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -warnings-as-errors"
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
with:
linux_5_9_enabled: false
linux_5_10_enabled: false
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -warnings-as-errors"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable -Xswiftc -warnings-as-errors"
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ extension ClientRPCExecutor {
}
} catch let error as RPCError {
return StreamingClientResponse(error: error)
} catch let error as RPCErrorConvertible {
} catch let error as any RPCErrorConvertible {
return StreamingClientResponse(error: RPCError(error))
} catch let other {
let error = RPCError(code: .unknown, message: "", cause: other)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ extension ServerRPCExecutor {
}
} catch let error as RPCError {
return StreamingServerResponse(error: error)
} catch let error as RPCErrorConvertible {
} catch let error as any RPCErrorConvertible {
return StreamingServerResponse(error: RPCError(error))
} catch let other {
let error = RPCError(code: .unknown, message: "", cause: other)
Expand Down
4 changes: 2 additions & 2 deletions Tests/GRPCCoreTests/Call/Server/ServerResponseTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct ServerResponseTests {
trailingMetadata: ["metadata": "trailing"]
)

let contents = try #require(try response.accepted.get())
let contents = try response.accepted.get()
#expect(contents.message == "message")
#expect(contents.metadata == ["metadata": "initial"])
#expect(contents.trailingMetadata == ["metadata": "trailing"])
Expand Down Expand Up @@ -55,7 +55,7 @@ struct ServerResponseTests {
return ["metadata": "trailing"]
}

let contents = try #require(try response.accepted.get())
let contents = try response.accepted.get()
#expect(contents.metadata == ["metadata": "initial"])
let trailingMetadata = try await contents.producer(.failTestOnWrite())
#expect(trailingMetadata == ["metadata": "trailing"])
Expand Down
8 changes: 4 additions & 4 deletions Tests/GRPCCoreTests/GRPCClientTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ struct ClientTests {
deserializer: IdentityDeserializer(),
options: .defaults
) { response in
let message = try #require(try response.message)
let message = try response.message
#expect(message == Array("hello".utf8))
}

Expand All @@ -449,7 +449,7 @@ struct ClientTests {
deserializer: IdentityDeserializer(),
options: .defaults
) { response in
let message = try #require(try response.message)
let message = try response.message
#expect(message == Array("Hello, Swift!".utf8))
}

Expand Down Expand Up @@ -494,7 +494,7 @@ struct ClientTests {
deserializer: IdentityDeserializer(),
options: .defaults
) { response in
let message = try #require(try response.message)
let message = try response.message
#expect(message == Array("hello".utf8))
}

Expand All @@ -512,7 +512,7 @@ struct ClientTests {
deserializer: IdentityDeserializer(),
options: .defaults
) { response in
let message = try #require(try response.message)
let message = try response.message
#expect(message == Array("hello".utf8))
}

Expand Down
Loading