Reformat async code

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: "Formatting and License Headers check"
       run: |
-        SWIFTFORMAT_VERSION=0.46.3
+        SWIFTFORMAT_VERSION=0.49.4
         git clone --depth 1 --branch "$SWIFTFORMAT_VERSION" "https://github.com/nicklockwood/SwiftFormat" "$HOME/SwiftFormat"
         swift build --package-path "$HOME/SwiftFormat" --product swiftformat
         export PATH=$PATH:"$(swift build --package-path "$HOME/SwiftFormat" --show-bin-path)"

.swiftformat

@@ -37,3 +37,6 @@
 
 # Don't prefer using key paths for trivial closures.
 --disable preferKeyPath
+
+# Put ACLs on declarations within an extension rather than the extension itself.
+--extensionacl on-declarations

Examples/Google/NaturalLanguage/Sources/main.swift

@@ -56,7 +56,7 @@ func getAuthToken(
   do {
     try provider.withToken { token, error in
       if let token = token,
-        let accessToken = token.AccessToken {
+         let accessToken = token.AccessToken {
         promise.succeed(accessToken)
       } else if let error = error {
         promise.fail(error)

Examples/Google/SpeechToText/Sources/Launch/SceneDelegate.swift

@@ -35,7 +35,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     self.navController?.navigationBar.prefersLargeTitles = false
 
     let viewController: UIViewController = ViewController()
-    navController?.pushViewController(viewController, animated: false)
+    self.navController?.pushViewController(viewController, animated: false)
 
     self.window = UIWindow(windowScene: windowScene)
     self.window!.rootViewController = self.navController

Examples/Google/SpeechToText/Sources/SpeechService.swift

@@ -66,8 +66,10 @@ final class SpeechService {
     )
   }
 
-  func stream(_ data: Data,
-              completion: ((Google_Cloud_Speech_V1_StreamingRecognizeResponse) -> Void)? = nil) {
+  func stream(
+    _ data: Data,
+    completion: ((Google_Cloud_Speech_V1_StreamingRecognizeResponse) -> Void)? = nil
+  ) {
     switch self.state {
     case .idle:
       // Initialize the bidirectional stream

Examples/Google/SpeechToText/Sources/ViewController.swift

@@ -56,8 +56,10 @@ final class ViewController: UIViewController {
   private let speechService: SpeechService
   private let audioStreamManager: AudioStreamManager
 
-  init(speechService: SpeechService,
-       audioStreamManager: AudioStreamManager) {
+  init(
+    speechService: SpeechService,
+    audioStreamManager: AudioStreamManager
+  ) {
     self.speechService = speechService
     self.audioStreamManager = audioStreamManager
 

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/AsyncPingPongRequestMaker.swift

@@ -39,11 +39,13 @@ final class AsyncPingPongRequestMaker: RequestMaker {
   ///    - requestMessage: Pre-made request message to use possibly repeatedly.
   ///    - logger: Where to log useful diagnostics.
   ///    - stats: Where to record statistics on latency.
-  init(config: Grpc_Testing_ClientConfig,
-       client: Grpc_Testing_BenchmarkServiceClient,
-       requestMessage: Grpc_Testing_SimpleRequest,
-       logger: Logger,
-       stats: StatsWithLock) {
+  init(
+    config: Grpc_Testing_ClientConfig,
+    client: Grpc_Testing_BenchmarkServiceClient,
+    requestMessage: Grpc_Testing_SimpleRequest,
+    logger: Logger,
+    stats: StatsWithLock
+  ) {
     self.client = client
     self.requestMessage = requestMessage
     self.logger = logger
@@ -70,7 +72,7 @@ final class AsyncPingPongRequestMaker: RequestMaker {
       let endTime = grpcTimeNow()
       self.stats.add(latency: endTime - startTime)
       if !self.stopRequested,
-        self.messagesPerStream == 0 || messagesSent < self.messagesPerStream {
+         self.messagesPerStream == 0 || messagesSent < self.messagesPerStream {
         messagesSent += 1
         startTime = endTime // Use end of previous request as the start of the next.
         streamingCall!.sendMessage(self.requestMessage, promise: nil)

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/AsyncUnaryRequestMaker.swift

@@ -32,11 +32,13 @@ final class AsyncUnaryRequestMaker: RequestMaker {
   ///    - requestMessage: Pre-made request message to use possibly repeatedly.
   ///    - logger: Where to log useful diagnostics.
   ///    - stats: Where to record statistics on latency.
-  init(config: Grpc_Testing_ClientConfig,
-       client: Grpc_Testing_BenchmarkServiceClient,
-       requestMessage: Grpc_Testing_SimpleRequest,
-       logger: Logger,
-       stats: StatsWithLock) {
+  init(
+    config: Grpc_Testing_ClientConfig,
+    client: Grpc_Testing_BenchmarkServiceClient,
+    requestMessage: Grpc_Testing_SimpleRequest,
+    logger: Logger,
+    stats: StatsWithLock
+  ) {
     self.client = client
     self.requestMessage = requestMessage
     self.logger = logger

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/BenchmarkServiceImpl.swift

@@ -24,8 +24,10 @@ final class AsyncQPSServerImpl: Grpc_Testing_BenchmarkServiceProvider {
 
   /// One request followed by one response.
   /// The server returns the client payload as-is.
-  func unaryCall(request: Grpc_Testing_SimpleRequest,
-                 context: StatusOnlyCallContext) -> EventLoopFuture<Grpc_Testing_SimpleResponse> {
+  func unaryCall(
+    request: Grpc_Testing_SimpleRequest,
+    context: StatusOnlyCallContext
+  ) -> EventLoopFuture<Grpc_Testing_SimpleResponse> {
     do {
       return context.eventLoop
         .makeSucceededFuture(try AsyncQPSServerImpl.processSimpleRPC(request: request))
@@ -93,8 +95,10 @@ final class AsyncQPSServerImpl: Grpc_Testing_BenchmarkServiceProvider {
   }
 
   /// Make a payload for sending back to the client.
-  private static func makePayload(type: Grpc_Testing_PayloadType,
-                                  size: Int) throws -> Grpc_Testing_Payload {
+  private static func makePayload(
+    type: Grpc_Testing_PayloadType,
+    size: Int
+  ) throws -> Grpc_Testing_Payload {
     if type != .compressable {
       // Making a payload which is not compressable is hard - and not implemented in
       // other implementations too.

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/RequestMaker.swift

@@ -27,11 +27,13 @@ protocol RequestMaker {
   ///    - requestMessage: Pre-made request message to use possibly repeatedly.
   ///    - logger: Where to log useful diagnostics.
   ///    - stats: Where to record statistics on latency.
-  init(config: Grpc_Testing_ClientConfig,
-       client: Grpc_Testing_BenchmarkServiceClient,
-       requestMessage: Grpc_Testing_SimpleRequest,
-       logger: Logger,
-       stats: StatsWithLock)
+  init(
+    config: Grpc_Testing_ClientConfig,
+    client: Grpc_Testing_BenchmarkServiceClient,
+    requestMessage: Grpc_Testing_SimpleRequest,
+    logger: Logger,
+    stats: StatsWithLock
+  )
 
   /// Initiate a request sequence to the server.
   /// - returns: A future which completes when the request-response sequence is complete.

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/StatusCountsSerialisation.swift

@@ -20,7 +20,7 @@ extension StatusCounts {
   /// Convert status count to a protobuf for sending to the driver process.
   /// - returns: The protobuf message for sending.
   public func toRequestResultCounts() -> [Grpc_Testing_RequestResultCount] {
-    return counts.map { (key, value) -> Grpc_Testing_RequestResultCount in
+    return counts.map { key, value -> Grpc_Testing_RequestResultCount in
       var grpc = Grpc_Testing_RequestResultCount()
       grpc.count = value
       grpc.statusCode = Int32(key)

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/WorkerServiceImpl.swift

@@ -75,16 +75,20 @@ class WorkerServiceImpl: Grpc_Testing_WorkerServiceProvider {
   }
 
   /// Just return the core count - unary call
-  func coreCount(request: Grpc_Testing_CoreRequest,
-                 context: StatusOnlyCallContext) -> EventLoopFuture<Grpc_Testing_CoreResponse> {
+  func coreCount(
+    request: Grpc_Testing_CoreRequest,
+    context: StatusOnlyCallContext
+  ) -> EventLoopFuture<Grpc_Testing_CoreResponse> {
     context.logger.notice("coreCount queried")
     let cores = Grpc_Testing_CoreResponse.with { $0.cores = Int32(System.coreCount) }
     return context.eventLoop.makeSucceededFuture(cores)
   }
 
   /// Quit this worker
-  func quitWorker(request: Grpc_Testing_Void,
-                  context: StatusOnlyCallContext) -> EventLoopFuture<Grpc_Testing_Void> {
+  func quitWorker(
+    request: Grpc_Testing_Void,
+    context: StatusOnlyCallContext
+  ) -> EventLoopFuture<Grpc_Testing_Void> {
     context.logger.warning("quitWorker called")
     self.finishedPromise.succeed(())
     return context.eventLoop.makeSucceededFuture(Grpc_Testing_Void())
@@ -109,8 +113,10 @@ class WorkerServiceImpl: Grpc_Testing_WorkerServiceProvider {
 
   /// Handle a request to setup a server.
   /// Makes a new server and sets it running.
-  private func handleServerSetup(context: StreamingResponseCallContext<Grpc_Testing_ServerStatus>,
-                                 config: Grpc_Testing_ServerConfig) {
+  private func handleServerSetup(
+    context: StreamingResponseCallContext<Grpc_Testing_ServerStatus>,
+    config: Grpc_Testing_ServerConfig
+  ) {
     context.logger.info("server setup requested")
     guard self.runningServer == nil else {
       context.logger.error("server already running")
@@ -159,8 +165,10 @@ class WorkerServiceImpl: Grpc_Testing_WorkerServiceProvider {
   // MARK: Create Server
 
   /// Start a server running of the requested type.
-  private func runServerBody(context: StreamingResponseCallContext<Grpc_Testing_ServerStatus>,
-                             serverConfig: Grpc_Testing_ServerConfig) {
+  private func runServerBody(
+    context: StreamingResponseCallContext<Grpc_Testing_ServerStatus>,
+    serverConfig: Grpc_Testing_ServerConfig
+  ) {
     var serverConfig = serverConfig
     self.serverPortOverride.map { serverConfig.port = Int32($0) }
 
@@ -228,8 +236,10 @@ class WorkerServiceImpl: Grpc_Testing_WorkerServiceProvider {
   }
 
   /// Setup a client as described by the message from the driver.
-  private func handleClientSetup(context: StreamingResponseCallContext<Grpc_Testing_ClientStatus>,
-                                 config: Grpc_Testing_ClientConfig) {
+  private func handleClientSetup(
+    context: StreamingResponseCallContext<Grpc_Testing_ClientStatus>,
+    config: Grpc_Testing_ClientConfig
+  ) {
     context.logger.info("client setup requested")
     guard self.runningClient == nil else {
       context.logger.error("client already running")
@@ -282,8 +292,10 @@ class WorkerServiceImpl: Grpc_Testing_WorkerServiceProvider {
   // MARK: Create Client
 
   /// Setup and run a client of the requested type.
-  private func runClientBody(context: StreamingResponseCallContext<Grpc_Testing_ClientStatus>,
-                             clientConfig: Grpc_Testing_ClientConfig) {
+  private func runClientBody(
+    context: StreamingResponseCallContext<Grpc_Testing_ClientStatus>,
+    clientConfig: Grpc_Testing_ClientConfig
+  ) {
     do {
       self.runningClient = try WorkerServiceImpl.makeClient(
         context: context,

Sources/Examples/RouteGuide/Server/RouteGuideProvider.swift

@@ -137,7 +137,7 @@ private func degreesToRadians(_ degrees: Double) -> Double {
 }
 
 extension Routeguide_Point {
-  func distance(to other: Routeguide_Point) -> Double {
+  fileprivate func distance(to other: Routeguide_Point) -> Double {
     // Radius of Earth in meters
     let radius = 6_371_000.0
     // Points are in the E7 representation (degrees multiplied by 10**7 and rounded to the nearest

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncBidirectionalStreamingCall.swift

@@ -48,7 +48,6 @@ public struct GRPCAsyncBidirectionalStreamingCall<Request: Sendable, Response: S
   /// received. However, it is not necessary for the response to have been consumed before reading
   /// this property.
   public var initialMetadata: HPACKHeaders {
-    // swiftformat:disable:next redundantGet
     get async throws {
       try await self.responseParts.initialMetadata.get()
     }
@@ -58,7 +57,6 @@ public struct GRPCAsyncBidirectionalStreamingCall<Request: Sendable, Response: S
   ///
   /// - Important: Awaiting this property will suspend until the responses have been consumed.
   public var trailingMetadata: HPACKHeaders {
-    // swiftformat:disable:next redundantGet
     get async throws {
       try await self.responseParts.trailingMetadata.get()
     }
@@ -68,7 +66,6 @@ public struct GRPCAsyncBidirectionalStreamingCall<Request: Sendable, Response: S
   ///
   /// - Important: Awaiting this property will suspend until the responses have been consumed.
   public var status: GRPCStatus {
-    // swiftformat:disable:next redundantGet
     get async {
       // force-try acceptable because any error is encapsulated in a successful GRPCStatus future.
       try! await self.responseParts.status.get()

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncClientStreamingCall.swift

@@ -42,15 +42,13 @@ public struct GRPCAsyncClientStreamingCall<Request: Sendable, Response: Sendable
   ///
   /// - Important: The initial metadata will only be available when the response has been received.
   public var initialMetadata: HPACKHeaders {
-    // swiftformat:disable:next redundantGet
     get async throws {
       try await self.responseParts.initialMetadata.get()
     }
   }
 
   /// The response returned by the server.
   public var response: Response {
-    // swiftformat:disable:next redundantGet
     get async throws {
       try await self.responseParts.response.get()
     }
@@ -60,7 +58,6 @@ public struct GRPCAsyncClientStreamingCall<Request: Sendable, Response: Sendable
   ///
   /// - Important: Awaiting this property will suspend until the responses have been consumed.
   public var trailingMetadata: HPACKHeaders {
-    // swiftformat:disable:next redundantGet
     get async throws {
       try await self.responseParts.trailingMetadata.get()
     }
@@ -70,7 +67,6 @@ public struct GRPCAsyncClientStreamingCall<Request: Sendable, Response: Sendable
   ///
   /// - Important: Awaiting this property will suspend until the responses have been consumed.
   public var status: GRPCStatus {
-    // swiftformat:disable:next redundantGet
     get async {
       // force-try acceptable because any error is encapsulated in a successful GRPCStatus future.
       try! await self.responseParts.status.get()

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncRequestStreamWriter.swift

@@ -89,10 +89,10 @@ extension GRPCAsyncRequestStreamWriter {
     internal let _compressionEnabled: Bool
 
     @usableFromInline
-    internal let _send: @Sendable(Request, MessageMetadata) -> Void
+    internal let _send: @Sendable (Request, MessageMetadata) -> Void
 
     @usableFromInline
-    internal let _finish: @Sendable() -> Void
+    internal let _finish: @Sendable () -> Void
 
     @inlinable
     internal init(

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncResponseStreamWriter.swift

@@ -55,10 +55,10 @@ internal final class AsyncResponseStreamWriterDelegate<Response: Sendable>: Asyn
   internal let _context: GRPCAsyncServerCallContext
 
   @usableFromInline
-  internal let _send: @Sendable(Response, MessageMetadata) -> Void
+  internal let _send: @Sendable (Response, MessageMetadata) -> Void
 
   @usableFromInline
-  internal let _finish: @Sendable(GRPCStatus) -> Void
+  internal let _finish: @Sendable (GRPCStatus) -> Void
 
   @usableFromInline
   internal let _compressionEnabledOnServer: Bool
@@ -70,8 +70,8 @@ internal final class AsyncResponseStreamWriterDelegate<Response: Sendable>: Asyn
   internal init(
     context: GRPCAsyncServerCallContext,
     compressionIsEnabled: Bool,
-    send: @escaping @Sendable(Response, MessageMetadata) -> Void,
-    finish: @escaping @Sendable(GRPCStatus) -> Void
+    send: @escaping @Sendable (Response, MessageMetadata) -> Void,
+    finish: @escaping @Sendable (GRPCStatus) -> Void
   ) {
     self._context = context
     self._compressionEnabledOnServer = compressionIsEnabled

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncServerHandler.swift

@@ -60,7 +60,7 @@ extension GRPCAsyncServerHandler {
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    wrapping unary: @escaping @Sendable(Request, GRPCAsyncServerCallContext) async throws
+    wrapping unary: @escaping @Sendable (Request, GRPCAsyncServerCallContext) async throws
       -> Response
   ) {
     self._handler = .init(
@@ -85,7 +85,7 @@ extension GRPCAsyncServerHandler {
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    wrapping clientStreaming: @escaping @Sendable(
+    wrapping clientStreaming: @escaping @Sendable (
       GRPCAsyncRequestStream<Request>,
       GRPCAsyncServerCallContext
     ) async throws -> Response
@@ -108,7 +108,7 @@ extension GRPCAsyncServerHandler {
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    wrapping serverStreaming: @escaping @Sendable(
+    wrapping serverStreaming: @escaping @Sendable (
       Request,
       GRPCAsyncResponseStreamWriter<Response>,
       GRPCAsyncServerCallContext
@@ -135,7 +135,7 @@ extension GRPCAsyncServerHandler {
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    wrapping bidirectional: @escaping @Sendable(
+    wrapping bidirectional: @escaping @Sendable (
       GRPCAsyncRequestStream<Request>,
       GRPCAsyncResponseStreamWriter<Response>,
       GRPCAsyncServerCallContext
@@ -181,7 +181,7 @@ internal final class AsyncServerHandler<
 
   /// The user provided function to execute.
   @usableFromInline
-  internal let userHandler: @Sendable(
+  internal let userHandler: @Sendable (
     GRPCAsyncRequestStream<Request>,
     GRPCAsyncResponseStreamWriter<Response>,
     GRPCAsyncServerCallContext
@@ -263,7 +263,7 @@ internal final class AsyncServerHandler<
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    userHandler: @escaping @Sendable(
+    userHandler: @escaping @Sendable (
       GRPCAsyncRequestStream<Request>,
       GRPCAsyncResponseStreamWriter<Response>,
       GRPCAsyncServerCallContext