Skip to content

Commit 4ce6646

Browse files
fixup: swiftformat
Signed-off-by: Si Beaumont <[email protected]>
1 parent 028546f commit 4ce6646

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncResponseStreamWriter.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public struct GRPCAsyncResponseStreamWriter<Response> {
3535
_ response: Response,
3636
compression: Compression = .deferToCallDefault
3737
) async throws {
38-
try await _asyncWriter.write((response, compression))
38+
try await self._asyncWriter.write((response, compression))
3939
}
4040
}
4141

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncServerHandler.swift

+13-9
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,16 @@ internal final class AsyncServerHandler<
386386
let requestStream = GRPCAsyncRequestStream(.init(consuming: requestStreamSource))
387387

388388
// TODO: In future use `AsyncWriter.init(maxPendingElements:maxWritesBeforeYield:delegate:)`?
389-
let responseStreamWriter = GRPCAsyncResponseStreamWriter(wrapping: AsyncWriter(delegate: AsyncResponseStreamWriterDelegate(
390-
context: context,
391-
compressionIsEnabled: self.context.encoding.isEnabled,
392-
send: { response, metadata in
393-
self.interceptResponse(response, metadata: metadata, promise: nil)
394-
}
395-
)))
389+
let responseStreamWriter =
390+
GRPCAsyncResponseStreamWriter(
391+
wrapping: AsyncWriter(delegate: AsyncResponseStreamWriterDelegate(
392+
context: context,
393+
compressionIsEnabled: self.context.encoding.isEnabled,
394+
send: { response, metadata in
395+
self.interceptResponse(response, metadata: metadata, promise: nil)
396+
}
397+
))
398+
)
396399

397400
// Set the state to active and bundle in all the associated data.
398401
self.state = .active(requestStreamSource, context, responseStreamWriter, userHandlerPromise)
@@ -540,7 +543,8 @@ internal final class AsyncServerHandler<
540543
// The user handler is done but there may be pending writes in the response stream writer.
541544

542545
// Create a promise to hang a callback off when the response stream is drained.
543-
let responseStreamDrainedPromise: EventLoopPromise<GRPCStatus> = self.context.eventLoop.makePromise()
546+
let responseStreamDrainedPromise: EventLoopPromise<GRPCStatus> = self.context.eventLoop
547+
.makePromise()
544548

545549
// Register callback for the response stream being drained.
546550
responseStreamDrainedPromise.futureResult.whenComplete(self.responseStreamDrained(_:))
@@ -644,7 +648,7 @@ internal final class AsyncServerHandler<
644648
// NOTE: This line used to be before we explicitly fail the status promise but it was exaserbating a race condition and causing crashes. See https://bugs.swift.org/browse/SR-15108.
645649
self.userHandlerTask?.cancel()
646650

647-
case .finishingSuccessfully(_, _, _):
651+
case .finishingSuccessfully:
648652
self.responseStreamDrainTask?.cancel()
649653

650654
case .completed:

0 commit comments

Comments
 (0)