Skip to content

Commit 6c4589b

Browse files
committed
PR changes
1 parent 7d723f5 commit 6c4589b

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Sources/GRPCCore/RPCError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public struct RPCError: Sendable, Hashable, Error {
5858
while let nextRPCErrorCause = nextCause as? RPCError {
5959
if code == nextRPCErrorCause.code {
6060
finalMessage = finalMessage + " \(nextRPCErrorCause.message)"
61-
finalMetadata.merge(nextRPCErrorCause.metadata)
61+
finalMetadata.add(contentsOf: nextRPCErrorCause.metadata)
6262
nextCause = nextRPCErrorCause.cause
6363
} else {
6464
nextCause = RPCError(

Tests/GRPCCoreTests/RPCErrorTests.swift

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,17 @@ struct RPCErrorTests {
3939
#expect(RPCError(status: status) == nil)
4040

4141
status.code = .invalidArgument
42-
var error = RPCError(status: status)
43-
try #require(error != nil)
44-
#expect(error!.code == .invalidArgument)
45-
#expect(error!.message == "")
46-
#expect(error!.metadata == [:])
42+
var error = try #require(RPCError(status: status))
43+
#expect(error.code == .invalidArgument)
44+
#expect(error.message == "")
45+
#expect(error.metadata == [:])
4746

4847
status.code = .cancelled
4948
status.message = "an error message"
50-
error = RPCError(status: status)
51-
try #require(error != nil)
52-
#expect(error!.code == .cancelled)
53-
#expect(error!.message == "an error message")
54-
#expect(error!.metadata == [:])
49+
error = try #require(RPCError(status: status))
50+
#expect(error.code == .cancelled)
51+
#expect(error.message == "an error message")
52+
#expect(error.metadata == [:])
5553
}
5654

5755
@Test(

0 commit comments

Comments
 (0)