diff --git a/Package.swift b/Package.swift index f76abeeed8f..5537a0f7e1c 100644 --- a/Package.swift +++ b/Package.swift @@ -234,7 +234,8 @@ let package = Package( "NIOEmbedded", "NIOHTTP1", swiftAtomics, - ] + ], + swiftSettings: strictConcurrencySettings ), .target( name: "_NIOFileSystem", diff --git a/Sources/NIOTestUtils/NIOHTTP1TestServer.swift b/Sources/NIOTestUtils/NIOHTTP1TestServer.swift index 6687d6e8838..08712e2f95b 100644 --- a/Sources/NIOTestUtils/NIOHTTP1TestServer.swift +++ b/Sources/NIOTestUtils/NIOHTTP1TestServer.swift @@ -263,18 +263,16 @@ public final class NIOHTTP1TestServer { self.handleChannels() return } - channel.pipeline.configureHTTPServerPipeline().flatMap { + do { + try channel.pipeline.syncOperations.configureHTTPServerPipeline() if self.aggregateBody { - return channel.pipeline.addHandler(AggregateBodyHandler()) - } else { - return self.eventLoop.makeSucceededVoidFuture() + try channel.pipeline.syncOperations.addHandler(AggregateBodyHandler()) } - }.flatMap { - channel.pipeline.addHandler(WebServerHandler(webServer: self)) - }.flatMap { - channel.pipeline.addHandler(TransformerHandler()) - }.whenSuccess { - _ = channel.setOption(.autoRead, value: true) + try channel.pipeline.syncOperations.addHandler(WebServerHandler(webServer: self)) + try channel.pipeline.syncOperations.addHandler(TransformerHandler()) + _ = try channel.syncOptions!.setOption(.autoRead, value: true) + } catch { + fatalError("Channel initialization failed with: \(error)") } }