diff --git a/IntegrationTests/grpc-performance-tests/Sources/ResourceUsage.swift b/IntegrationTests/grpc-performance-tests/Sources/ResourceUsage.swift index f45a5d4..694c5b9 100644 --- a/IntegrationTests/grpc-performance-tests/Sources/ResourceUsage.swift +++ b/IntegrationTests/grpc-performance-tests/Sources/ResourceUsage.swift @@ -16,7 +16,7 @@ import Dispatch import NIOCore -import NIOFileSystem +import _NIOFileSystem #if canImport(Darwin) import Darwin diff --git a/Sources/GRPCNIOTransportCore/Server/CommonHTTP2ServerTransport.swift b/Sources/GRPCNIOTransportCore/Server/CommonHTTP2ServerTransport.swift index e7e9654..e2c8874 100644 --- a/Sources/GRPCNIOTransportCore/Server/CommonHTTP2ServerTransport.swift +++ b/Sources/GRPCNIOTransportCore/Server/CommonHTTP2ServerTransport.swift @@ -154,10 +154,11 @@ package final class CommonHTTP2ServerTransport< } package func listen( - streamHandler: @escaping @Sendable ( - _ stream: RPCStream, - _ context: ServerContext - ) async -> Void + streamHandler: + @escaping @Sendable ( + _ stream: RPCStream, + _ context: ServerContext + ) async -> Void ) async throws { defer { switch self.listeningAddressState.withLock({ $0.close() }) { @@ -205,10 +206,11 @@ package final class CommonHTTP2ServerTransport< private func handleConnection( _ connection: NIOAsyncChannel, multiplexer: ChannelPipeline.SynchronousOperations.HTTP2StreamMultiplexer, - streamHandler: @escaping @Sendable ( - _ stream: RPCStream, - _ context: ServerContext - ) async -> Void + streamHandler: + @escaping @Sendable ( + _ stream: RPCStream, + _ context: ServerContext + ) async -> Void ) async throws { let remotePeer = connection.channel.remoteAddressInfo let localPeer = connection.channel.localAddressInfo @@ -246,10 +248,11 @@ package final class CommonHTTP2ServerTransport< private func handleStream( _ stream: NIOAsyncChannel, RPCResponsePart>, _ connection: NIOAsyncChannel, - handler streamHandler: @escaping @Sendable ( - _ stream: RPCStream, - _ context: ServerContext - ) async -> Void, + handler streamHandler: + @escaping @Sendable ( + _ stream: RPCStream, + _ context: ServerContext + ) async -> Void, descriptor: EventLoopFuture, remotePeer: String, localPeer: String diff --git a/Sources/GRPCNIOTransportHTTP2Posix/HTTP2ServerTransport+Posix.swift b/Sources/GRPCNIOTransportHTTP2Posix/HTTP2ServerTransport+Posix.swift index 016f438..b86206e 100644 --- a/Sources/GRPCNIOTransportHTTP2Posix/HTTP2ServerTransport+Posix.swift +++ b/Sources/GRPCNIOTransportHTTP2Posix/HTTP2ServerTransport+Posix.swift @@ -212,10 +212,11 @@ extension HTTP2ServerTransport { } public func listen( - streamHandler: @escaping @Sendable ( - _ stream: RPCStream, - _ context: ServerContext - ) async -> Void + streamHandler: + @escaping @Sendable ( + _ stream: RPCStream, + _ context: ServerContext + ) async -> Void ) async throws { try await self.underlyingTransport.listen(streamHandler: streamHandler) } diff --git a/Sources/GRPCNIOTransportHTTP2TransportServices/HTTP2ServerTransport+TransportServices.swift b/Sources/GRPCNIOTransportHTTP2TransportServices/HTTP2ServerTransport+TransportServices.swift index a2dc6e4..49765b4 100644 --- a/Sources/GRPCNIOTransportHTTP2TransportServices/HTTP2ServerTransport+TransportServices.swift +++ b/Sources/GRPCNIOTransportHTTP2TransportServices/HTTP2ServerTransport+TransportServices.swift @@ -133,10 +133,11 @@ extension HTTP2ServerTransport { } public func listen( - streamHandler: @escaping @Sendable ( - _ stream: RPCStream, - _ context: ServerContext - ) async -> Void + streamHandler: + @escaping @Sendable ( + _ stream: RPCStream, + _ context: ServerContext + ) async -> Void ) async throws { try await self.underlyingTransport.listen(streamHandler: streamHandler) } diff --git a/Tests/GRPCNIOTransportHTTP2Tests/ControlClient.swift b/Tests/GRPCNIOTransportHTTP2Tests/ControlClient.swift index fe400ae..8d72d92 100644 --- a/Tests/GRPCNIOTransportHTTP2Tests/ControlClient.swift +++ b/Tests/GRPCNIOTransportHTTP2Tests/ControlClient.swift @@ -93,9 +93,10 @@ internal struct ControlClient where Transport: ClientTransport { internal func waitForCancellation( request: GRPCCore.ClientRequest, options: GRPCCore.CallOptions = .defaults, - _ body: @Sendable @escaping ( - _ response: GRPCCore.StreamingClientResponse - ) async throws -> R + _ body: + @Sendable @escaping ( + _ response: GRPCCore.StreamingClientResponse + ) async throws -> R ) async throws -> R where R: Sendable { try await self.client.serverStreaming( request: request, @@ -109,9 +110,10 @@ internal struct ControlClient where Transport: ClientTransport { internal func peerInfo( options: GRPCCore.CallOptions = .defaults, - _ body: @Sendable @escaping ( - _ response: GRPCCore.ClientResponse - ) async throws -> R = { try $0.message } + _ body: + @Sendable @escaping ( + _ response: GRPCCore.ClientResponse + ) async throws -> R = { try $0.message } ) async throws -> R where R: Sendable { try await self.client.unary( request: ClientRequest(message: ""), diff --git a/Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/Services/HelloWorld/HelloWorldService.swift b/Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/Services/HelloWorld/HelloWorldService.swift index 94b9177..340e123 100644 --- a/Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/Services/HelloWorld/HelloWorldService.swift +++ b/Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/Services/HelloWorld/HelloWorldService.swift @@ -25,10 +25,11 @@ struct HelloWorldService: HelloWorld.SimpleServiceProtocol { ) async throws -> HelloResponse init( - implementation: @Sendable @escaping ( - _: HelloRequest, - _: ServerContext - ) async throws -> HelloResponse + implementation: + @Sendable @escaping ( + _: HelloRequest, + _: ServerContext + ) async throws -> HelloResponse ) { self.implementation = implementation } diff --git a/Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/TransportKind.swift b/Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/TransportKind.swift index d2fc15e..1d3e7fc 100644 --- a/Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/TransportKind.swift +++ b/Tests/GRPCNIOTransportHTTP2Tests/Test Utilities/TransportKind.swift @@ -173,10 +173,11 @@ enum NIOServerTransport: ServerTransport, ListeningServerTransport { } func listen( - streamHandler: @escaping @Sendable ( - _ stream: RPCStream, - _ context: ServerContext - ) async -> Void + streamHandler: + @escaping @Sendable ( + _ stream: RPCStream, + _ context: ServerContext + ) async -> Void ) async throws { switch self { case .posix(let transport):