Skip to content

Commit e785f08

Browse files
glbrnttglbrntt
authored
Format (#30)
Motivation: The formatter hasn't been run since the formatting CI image got updated so the formatting check now fails. Modifications: Run the formatter. Result: Formatting CI check passes
1 parent 5c04d83 commit e785f08

File tree

12 files changed

+137
-108
lines changed

12 files changed

+137
-108
lines changed

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

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ struct ServerRPCExecutor: Sendable {
3737
deserializer: some MessageDeserializer<Input>,
3838
serializer: some MessageSerializer<Output>,
3939
interceptors: [any ServerInterceptor],
40-
handler: @Sendable @escaping (
41-
_ request: StreamingServerRequest<Input>,
42-
_ context: ServerContext
43-
) async throws -> StreamingServerResponse<Output>
40+
handler:
41+
@Sendable @escaping (
42+
_ request: StreamingServerRequest<Input>,
43+
_ context: ServerContext
44+
) async throws -> StreamingServerResponse<Output>
4445
) async {
4546
// Wait for the first request part from the transport.
4647
let firstPart = await Self._waitForFirstRequestPart(inbound: stream.inbound)
@@ -75,10 +76,11 @@ struct ServerRPCExecutor: Sendable {
7576
deserializer: some MessageDeserializer<Input>,
7677
serializer: some MessageSerializer<Output>,
7778
interceptors: [any ServerInterceptor],
78-
handler: @escaping @Sendable (
79-
_ request: StreamingServerRequest<Input>,
80-
_ context: ServerContext
81-
) async throws -> StreamingServerResponse<Output>
79+
handler:
80+
@escaping @Sendable (
81+
_ request: StreamingServerRequest<Input>,
82+
_ context: ServerContext
83+
) async throws -> StreamingServerResponse<Output>
8284
) async {
8385
if let timeout = metadata.timeout {
8486
await Self._processRPCWithTimeout(
@@ -116,10 +118,11 @@ struct ServerRPCExecutor: Sendable {
116118
deserializer: some MessageDeserializer<Input>,
117119
serializer: some MessageSerializer<Output>,
118120
interceptors: [any ServerInterceptor],
119-
handler: @escaping @Sendable (
120-
_ request: StreamingServerRequest<Input>,
121-
_ context: ServerContext
122-
) async throws -> StreamingServerResponse<Output>
121+
handler:
122+
@escaping @Sendable (
123+
_ request: StreamingServerRequest<Input>,
124+
_ context: ServerContext
125+
) async throws -> StreamingServerResponse<Output>
123126
) async {
124127
await withTaskGroup(of: Void.self) { group in
125128
group.addTask {
@@ -156,10 +159,11 @@ struct ServerRPCExecutor: Sendable {
156159
deserializer: some MessageDeserializer<Input>,
157160
serializer: some MessageSerializer<Output>,
158161
interceptors: [any ServerInterceptor],
159-
handler: @escaping @Sendable (
160-
_ request: StreamingServerRequest<Input>,
161-
_ context: ServerContext
162-
) async throws -> StreamingServerResponse<Output>
162+
handler:
163+
@escaping @Sendable (
164+
_ request: StreamingServerRequest<Input>,
165+
_ context: ServerContext
166+
) async throws -> StreamingServerResponse<Output>
163167
) async {
164168
let messages = UncheckedAsyncIteratorSequence(inbound.wrappedValue).map { part in
165169
switch part {
@@ -294,10 +298,11 @@ extension ServerRPCExecutor {
294298
request: StreamingServerRequest<Input>,
295299
context: ServerContext,
296300
interceptors: [any ServerInterceptor],
297-
finally: @escaping @Sendable (
298-
_ request: StreamingServerRequest<Input>,
299-
_ context: ServerContext
300-
) async throws -> StreamingServerResponse<Output>
301+
finally:
302+
@escaping @Sendable (
303+
_ request: StreamingServerRequest<Input>,
304+
_ context: ServerContext
305+
) async throws -> StreamingServerResponse<Output>
301306
) async throws -> StreamingServerResponse<Output> {
302307
return try await self._intercept(
303308
request: request,
@@ -312,10 +317,11 @@ extension ServerRPCExecutor {
312317
request: StreamingServerRequest<Input>,
313318
context: ServerContext,
314319
iterator: Array<any ServerInterceptor>.Iterator,
315-
finally: @escaping @Sendable (
316-
_ request: StreamingServerRequest<Input>,
317-
_ context: ServerContext
318-
) async throws -> StreamingServerResponse<Output>
320+
finally:
321+
@escaping @Sendable (
322+
_ request: StreamingServerRequest<Input>,
323+
_ context: ServerContext
324+
) async throws -> StreamingServerResponse<Output>
319325
) async throws -> StreamingServerResponse<Output> {
320326
var iterator = iterator
321327

‎Sources/GRPCCore/Call/Server/RPCRouter.swift‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ public struct RPCRouter<Transport: ServerTransport>: Sendable {
5454
method: MethodDescriptor,
5555
deserializer: some MessageDeserializer<Input>,
5656
serializer: some MessageSerializer<Output>,
57-
handler: @Sendable @escaping (
58-
_ request: StreamingServerRequest<Input>,
59-
_ context: ServerContext
60-
) async throws -> StreamingServerResponse<Output>
57+
handler:
58+
@Sendable @escaping (
59+
_ request: StreamingServerRequest<Input>,
60+
_ context: ServerContext
61+
) async throws -> StreamingServerResponse<Output>
6162
) {
6263
self._fn = { stream, context, interceptors in
6364
await ServerRPCExecutor.execute(
@@ -125,10 +126,11 @@ public struct RPCRouter<Transport: ServerTransport>: Sendable {
125126
forMethod descriptor: MethodDescriptor,
126127
deserializer: some MessageDeserializer<Input>,
127128
serializer: some MessageSerializer<Output>,
128-
handler: @Sendable @escaping (
129-
_ request: StreamingServerRequest<Input>,
130-
_ context: ServerContext
131-
) async throws -> StreamingServerResponse<Output>
129+
handler:
130+
@Sendable @escaping (
131+
_ request: StreamingServerRequest<Input>,
132+
_ context: ServerContext
133+
) async throws -> StreamingServerResponse<Output>
132134
) {
133135
let handler = RPCHandler(
134136
method: descriptor,

‎Sources/GRPCCore/Call/Server/ServerInterceptor.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public protocol ServerInterceptor: Sendable {
7474
func intercept<Input: Sendable, Output: Sendable>(
7575
request: StreamingServerRequest<Input>,
7676
context: ServerContext,
77-
next: @Sendable (
78-
_ request: StreamingServerRequest<Input>,
79-
_ context: ServerContext
80-
) async throws -> StreamingServerResponse<Output>
77+
next:
78+
@Sendable (
79+
_ request: StreamingServerRequest<Input>,
80+
_ context: ServerContext
81+
) async throws -> StreamingServerResponse<Output>
8182
) async throws -> StreamingServerResponse<Output>
8283
}

‎Sources/GRPCCore/GRPCClient.swift‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,10 @@ public final class GRPCClient<Transport: ClientTransport>: Sendable {
261261
serializer: some MessageSerializer<Request>,
262262
deserializer: some MessageDeserializer<Response>,
263263
options: CallOptions,
264-
onResponse handleResponse: @Sendable @escaping (
265-
_ response: ClientResponse<Response>
266-
) async throws -> ReturnValue
264+
onResponse handleResponse:
265+
@Sendable @escaping (
266+
_ response: ClientResponse<Response>
267+
) async throws -> ReturnValue
267268
) async throws -> ReturnValue {
268269
try await self.bidirectionalStreaming(
269270
request: StreamingClientRequest(single: request),
@@ -294,9 +295,10 @@ public final class GRPCClient<Transport: ClientTransport>: Sendable {
294295
serializer: some MessageSerializer<Request>,
295296
deserializer: some MessageDeserializer<Response>,
296297
options: CallOptions,
297-
onResponse handleResponse: @Sendable @escaping (
298-
_ response: ClientResponse<Response>
299-
) async throws -> ReturnValue
298+
onResponse handleResponse:
299+
@Sendable @escaping (
300+
_ response: ClientResponse<Response>
301+
) async throws -> ReturnValue
300302
) async throws -> ReturnValue {
301303
try await self.bidirectionalStreaming(
302304
request: request,
@@ -327,9 +329,10 @@ public final class GRPCClient<Transport: ClientTransport>: Sendable {
327329
serializer: some MessageSerializer<Request>,
328330
deserializer: some MessageDeserializer<Response>,
329331
options: CallOptions,
330-
onResponse handleResponse: @Sendable @escaping (
331-
_ response: StreamingClientResponse<Response>
332-
) async throws -> ReturnValue
332+
onResponse handleResponse:
333+
@Sendable @escaping (
334+
_ response: StreamingClientResponse<Response>
335+
) async throws -> ReturnValue
333336
) async throws -> ReturnValue {
334337
try await self.bidirectionalStreaming(
335338
request: StreamingClientRequest(single: request),
@@ -361,9 +364,10 @@ public final class GRPCClient<Transport: ClientTransport>: Sendable {
361364
serializer: some MessageSerializer<Request>,
362365
deserializer: some MessageDeserializer<Response>,
363366
options: CallOptions,
364-
onResponse handleResponse: @Sendable @escaping (
365-
_ response: StreamingClientResponse<Response>
366-
) async throws -> ReturnValue
367+
onResponse handleResponse:
368+
@Sendable @escaping (
369+
_ response: StreamingClientResponse<Response>
370+
) async throws -> ReturnValue
367371
) async throws -> ReturnValue {
368372
let applicableInterceptors = try self.stateMachine.withLock {
369373
try $0.checkExecutableAndGetApplicableInterceptors(for: descriptor)

‎Sources/GRPCCore/Transport/ServerTransport.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ public protocol ServerTransport<Bytes>: Sendable {
4141
/// period after which any open streams may be cancelled. You can also cancel the task running
4242
/// ``listen(streamHandler:)`` to abruptly close connections and streams.
4343
func listen(
44-
streamHandler: @escaping @Sendable (
45-
_ stream: RPCStream<Inbound, Outbound>,
46-
_ context: ServerContext
47-
) async -> Void
44+
streamHandler:
45+
@escaping @Sendable (
46+
_ stream: RPCStream<Inbound, Outbound>,
47+
_ context: ServerContext
48+
) async -> Void
4849
) async throws
4950

5051
/// Indicates to the transport that no new streams should be accepted.

‎Sources/GRPCInProcessTransport/InProcessTransport+Server.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,11 @@ extension InProcessTransport {
103103
}
104104

105105
public func listen(
106-
streamHandler: @escaping @Sendable (
107-
_ stream: RPCStream<Inbound, Outbound>,
108-
_ context: ServerContext
109-
) async -> Void
106+
streamHandler:
107+
@escaping @Sendable (
108+
_ stream: RPCStream<Inbound, Outbound>,
109+
_ context: ServerContext
110+
) async -> Void
110111
) async throws {
111112
await withDiscardingTaskGroup { group in
112113
for await stream in self.newStreams {

‎Tests/GRPCCoreTests/Call/Client/Internal/ClientRPCExecutorTestSupport/ClientRPCExecutorTestHarness+ServerBehavior.swift‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ extension ClientRPCExecutorTestHarness {
3030
) async throws -> Void
3131

3232
init(
33-
_ handler: @escaping @Sendable (
34-
RPCStream<
35-
RPCAsyncSequence<RPCRequestPart<[UInt8]>, any Error>,
36-
RPCWriter<RPCResponsePart<[UInt8]>>.Closable
37-
>
38-
) async throws -> Void
33+
_ handler:
34+
@escaping @Sendable (
35+
RPCStream<
36+
RPCAsyncSequence<RPCRequestPart<[UInt8]>, any Error>,
37+
RPCWriter<RPCResponsePart<[UInt8]>>.Closable
38+
>
39+
) async throws -> Void
3940
) {
4041
self.handler = handler
4142
}

‎Tests/GRPCCoreTests/Call/Server/Internal/ServerRPCExecutorTestSupport/ServerRPCExecutorTestHarness.swift‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ struct ServerRPCExecutorTestHarness {
2727
) async throws -> StreamingServerResponse<Output>
2828

2929
init(
30-
_ fn: @escaping @Sendable (
31-
_ request: StreamingServerRequest<Input>,
32-
_ context: ServerContext
33-
) async throws -> StreamingServerResponse<Output>
30+
_ fn:
31+
@escaping @Sendable (
32+
_ request: StreamingServerRequest<Input>,
33+
_ context: ServerContext
34+
) async throws -> StreamingServerResponse<Output>
3435
) {
3536
self.fn = fn
3637
}
@@ -57,16 +58,19 @@ struct ServerRPCExecutorTestHarness {
5758
bytes: Bytes.Type = Bytes.self,
5859
deserializer: some MessageDeserializer<Input>,
5960
serializer: some MessageSerializer<Output>,
60-
handler: @escaping @Sendable (
61-
StreamingServerRequest<Input>,
62-
ServerContext
63-
) async throws -> StreamingServerResponse<Output>,
64-
producer: @escaping @Sendable (
65-
RPCWriter<RPCRequestPart<Bytes>>.Closable
66-
) async throws -> Void,
67-
consumer: @escaping @Sendable (
68-
RPCAsyncSequence<RPCResponsePart<Bytes>, any Error>
69-
) async throws -> Void
61+
handler:
62+
@escaping @Sendable (
63+
StreamingServerRequest<Input>,
64+
ServerContext
65+
) async throws -> StreamingServerResponse<Output>,
66+
producer:
67+
@escaping @Sendable (
68+
RPCWriter<RPCRequestPart<Bytes>>.Closable
69+
) async throws -> Void,
70+
consumer:
71+
@escaping @Sendable (
72+
RPCAsyncSequence<RPCResponsePart<Bytes>, any Error>
73+
) async throws -> Void
7074
) async throws {
7175
try await self.execute(
7276
deserializer: deserializer,
@@ -81,12 +85,14 @@ struct ServerRPCExecutorTestHarness {
8185
deserializer: some MessageDeserializer<Input>,
8286
serializer: some MessageSerializer<Output>,
8387
handler: ServerHandler<Input, Output>,
84-
producer: @escaping @Sendable (
85-
RPCWriter<RPCRequestPart<Bytes>>.Closable
86-
) async throws -> Void,
87-
consumer: @escaping @Sendable (
88-
RPCAsyncSequence<RPCResponsePart<Bytes>, any Error>
89-
) async throws -> Void
88+
producer:
89+
@escaping @Sendable (
90+
RPCWriter<RPCRequestPart<Bytes>>.Closable
91+
) async throws -> Void,
92+
consumer:
93+
@escaping @Sendable (
94+
RPCAsyncSequence<RPCResponsePart<Bytes>, any Error>
95+
) async throws -> Void
9096
) async throws {
9197
let input = GRPCAsyncThrowingStream.makeStream(of: RPCRequestPart<Bytes>.self)
9298
let output = GRPCAsyncThrowingStream.makeStream(of: RPCResponsePart<Bytes>.self)
@@ -132,12 +138,14 @@ struct ServerRPCExecutorTestHarness {
132138

133139
func execute(
134140
handler: ServerHandler<[UInt8], [UInt8]> = .echo,
135-
producer: @escaping @Sendable (
136-
RPCWriter<RPCRequestPart<[UInt8]>>.Closable
137-
) async throws -> Void,
138-
consumer: @escaping @Sendable (
139-
RPCAsyncSequence<RPCResponsePart<[UInt8]>, any Error>
140-
) async throws -> Void
141+
producer:
142+
@escaping @Sendable (
143+
RPCWriter<RPCRequestPart<[UInt8]>>.Closable
144+
) async throws -> Void,
145+
consumer:
146+
@escaping @Sendable (
147+
RPCAsyncSequence<RPCResponsePart<[UInt8]>, any Error>
148+
) async throws -> Void
141149
) async throws {
142150
try await self.execute(
143151
deserializer: IdentityDeserializer(),

‎Tests/GRPCCoreTests/Call/Server/RPCRouterTests.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ struct NoServerTransport: ServerTransport {
7070
typealias Bytes = [UInt8]
7171

7272
func listen(
73-
streamHandler: @escaping @Sendable (
74-
GRPCCore.RPCStream<Inbound, Outbound>,
75-
GRPCCore.ServerContext
76-
) async -> Void
73+
streamHandler:
74+
@escaping @Sendable (
75+
GRPCCore.RPCStream<Inbound, Outbound>,
76+
GRPCCore.ServerContext
77+
) async -> Void
7778
) async throws {
7879
}
7980

‎Tests/GRPCCoreTests/Test Utilities/Call/Server/ServerInterceptors.swift‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,11 @@ struct RejectAllServerInterceptor: ServerInterceptor {
8383
func intercept<Input: Sendable, Output: Sendable>(
8484
request: StreamingServerRequest<Input>,
8585
context: ServerContext,
86-
next: @Sendable (
87-
StreamingServerRequest<Input>,
88-
ServerContext
89-
) async throws -> StreamingServerResponse<Output>
86+
next:
87+
@Sendable (
88+
StreamingServerRequest<Input>,
89+
ServerContext
90+
) async throws -> StreamingServerResponse<Output>
9091
) async throws -> StreamingServerResponse<Output> {
9192
switch self.mode {
9293
case .throw(let error):
@@ -139,10 +140,11 @@ struct RequestCountingServerInterceptor: ServerInterceptor {
139140
func intercept<Input: Sendable, Output: Sendable>(
140141
request: StreamingServerRequest<Input>,
141142
context: ServerContext,
142-
next: @Sendable (
143-
StreamingServerRequest<Input>,
144-
ServerContext
145-
) async throws -> StreamingServerResponse<Output>
143+
next:
144+
@Sendable (
145+
StreamingServerRequest<Input>,
146+
ServerContext
147+
) async throws -> StreamingServerResponse<Output>
146148
) async throws -> StreamingServerResponse<Output> {
147149
self.counter.increment()
148150
return try await next(request, context)

0 commit comments

Comments
 (0)