Enable "ExistentialAny" upcoming feature (#622)

Author: fpseverino

Package.swift

@@ -3,13 +3,15 @@ import PackageDescription
 
 #if compiler(>=6.1)
 let swiftSettings: [SwiftSetting] = [
-    .enableUpcomingFeature("NonisolatedNonsendingByDefault")
+    .enableUpcomingFeature("ExistentialAny"),
+    .enableUpcomingFeature("NonisolatedNonsendingByDefault"),
 ]
 #else
 let swiftSettings: [SwiftSetting] = [
+    .enableUpcomingFeature("ExistentialAny"),
     // Sadly the 6.0 compiler concurrency checker finds false positives.
     // To be able to compile, lets reduce the language version down to 5 for 6.0 only.
-    .swiftLanguageMode(.v5)
+    .swiftLanguageMode(.v5),
 ]
 #endif
 

Sources/ConnectionPoolModule/ConnectionPool.swift

@@ -484,7 +484,7 @@ public final class ConnectionPool<
     }
 
     @inlinable
-    /*private*/ func connectionEstablishFailed(_ error: Error, for request: StateMachine.ConnectionRequest) {
+    /*private*/ func connectionEstablishFailed(_ error: any Error, for request: StateMachine.ConnectionRequest) {
         self.observabilityDelegate.connectFailed(id: request.connectionID, error: error)
 
         self.modifyStateAndRunActions { state in

Sources/ConnectionPoolModule/ConnectionPoolObservabilityDelegate.swift

@@ -9,7 +9,7 @@ public protocol ConnectionPoolObservabilityDelegate: Sendable {
 
     /// A connection attempt failed with the given error. After some period of
     /// time ``startedConnecting(id:)`` may be called again.
-    func connectFailed(id: ConnectionID, error: Error)
+    func connectFailed(id: ConnectionID, error: any Error)
 
     /// A connection was established on the connection with the given ID. `streamCapacity` streams are
     /// available to use on the connection. The maximum number of available streams may change over
@@ -24,15 +24,15 @@ public protocol ConnectionPoolObservabilityDelegate: Sendable {
 
     func keepAliveSucceeded(id: ConnectionID)
 
-    func keepAliveFailed(id: ConnectionID, error: Error)
+    func keepAliveFailed(id: ConnectionID, error: any Error)
 
     /// The remote peer is quiescing the connection: no new streams will be created on it. The
     /// connection will eventually be closed and removed from the pool.
     func connectionClosing(id: ConnectionID)
 
     /// The connection was closed. The connection may be established again in the future (notified
     /// via ``startedConnecting(id:)``).
-    func connectionClosed(id: ConnectionID, error: Error?)
+    func connectionClosed(id: ConnectionID, error: (any Error)?)
 
     func requestQueueDepthChanged(_ newDepth: Int)
 }
@@ -42,7 +42,7 @@ public struct NoOpConnectionPoolMetrics<ConnectionID: Hashable & Sendable>: Conn
 
     public func startedConnecting(id: ConnectionID) {}
 
-    public func connectFailed(id: ConnectionID, error: Error) {}
+    public func connectFailed(id: ConnectionID, error: any Error) {}
 
     public func connectSucceeded(id: ConnectionID, streamCapacity: UInt16) {}
 
@@ -52,11 +52,11 @@ public struct NoOpConnectionPoolMetrics<ConnectionID: Hashable & Sendable>: Conn
 
     public func keepAliveSucceeded(id: ConnectionID) {}
 
-    public func keepAliveFailed(id: ConnectionID, error: Error) {}
+    public func keepAliveFailed(id: ConnectionID, error: any Error) {}
 
     public func connectionClosing(id: ConnectionID) {}
 
-    public func connectionClosed(id: ConnectionID, error: Error?) {}
+    public func connectionClosed(id: ConnectionID, error: (any Error)?) {}
 
     public func requestQueueDepthChanged(_ newDepth: Int) {}
 }

Sources/ConnectionPoolModule/PoolStateMachine.swift

@@ -432,7 +432,7 @@ struct PoolStateMachine<
     }
 
     @inlinable
-    mutating func connectionEstablishFailed(_ error: Error, for request: ConnectionRequest) -> Action {
+    mutating func connectionEstablishFailed(_ error: any Error, for request: ConnectionRequest) -> Action {
         switch self.poolState {
         case .running:
             self.poolState = .connectionCreationFailing(

Sources/PostgresNIO/Connection/PostgresConnection+Configuration.swift

@@ -130,7 +130,7 @@ extension PostgresConnection {
         /// The `Channel` to use in existing-channel configurations.
         ///
         /// Always `nil` for other configurations.
-        public var establishedChannel: Channel? {
+        public var establishedChannel: (any Channel)? {
             if case let .configureChannel(channel) = self.endpointInfo { return channel }
             else { return nil }
         }
@@ -193,7 +193,7 @@ extension PostgresConnection {
         ///   - channel: The `NIOCore/Channel` to use. The channel must already be active and connected to an
         ///     endpoint (i.e. `NIOCore/Channel/isActive` must be `true`).
         ///   - tls: The TLS mode to use.
-        public init(establishedChannel channel: Channel, tls: PostgresConnection.Configuration.TLS, username: String, password: String?, database: String?) {
+        public init(establishedChannel channel: any Channel, tls: PostgresConnection.Configuration.TLS, username: String, password: String?, database: String?) {
             self.init(endpointInfo: .configureChannel(channel), tls: tls, username: username, password: password, database: database)
         }
 
@@ -206,14 +206,14 @@ extension PostgresConnection {
         /// - Parameters:
         ///   - channel: The `NIOCore/Channel` to use. The channel must already be active and connected to an
         ///     endpoint (i.e. `NIOCore/Channel/isActive` must be `true`).
-        public init(establishedChannel channel: Channel, username: String, password: String?, database: String?) {
+        public init(establishedChannel channel: any Channel, username: String, password: String?, database: String?) {
             self.init(establishedChannel: channel, tls: .disable, username: username, password: password, database: database)
         }
 
         // MARK: - Implementation details
 
         enum EndpointInfo {
-            case configureChannel(Channel)
+            case configureChannel(any Channel)
             case bindUnixDomainSocket(path: String)
             case connectTCP(host: String, port: Int)
         }
@@ -242,7 +242,7 @@ extension PostgresConnection {
             case unresolvedTCP(host: String, port: Int)
             case unresolvedUDS(path: String)
             case resolved(address: SocketAddress)
-            case bootstrapped(channel: Channel)
+            case bootstrapped(channel: any Channel)
         }
 
         let connection: InternalConfiguration.Connection

Sources/PostgresNIO/Connection/PostgresConnection.swift

@@ -17,10 +17,10 @@ public final class PostgresConnection: @unchecked Sendable {
     /// The connection's underlying channel
     ///
     /// This should be private, but it is needed for `PostgresConnection` compatibility.
-    internal let channel: Channel
+    internal let channel: any Channel
 
     /// The underlying `EventLoop` of both the connection and its channel.
-    public var eventLoop: EventLoop {
+    public var eventLoop: any EventLoop {
         return self.channel.eventLoop
     }
 
@@ -48,7 +48,7 @@ public final class PostgresConnection: @unchecked Sendable {
 
     private var _logger: Logger
 
-    init(channel: Channel, connectionID: ID, logger: Logger) {
+    init(channel: any Channel, connectionID: ID, logger: Logger) {
         self.channel = channel
         self.id = connectionID
         self._logger = logger
@@ -60,7 +60,7 @@ public final class PostgresConnection: @unchecked Sendable {
     func start(configuration: InternalConfiguration) -> EventLoopFuture<Void> {
         // 1. configure handlers
 
-        let configureSSLCallback: ((Channel, PostgresChannelHandler) throws -> ())?
+        let configureSSLCallback: ((any Channel, PostgresChannelHandler) throws -> ())?
 
         switch configuration.tls.base {
         case .prefer(let context), .require(let context):
@@ -124,7 +124,7 @@ public final class PostgresConnection: @unchecked Sendable {
     /// - Returns: A SwiftNIO `EventLoopFuture` that will provide a ``PostgresConnection``
     ///            at a later point in time.
     public static func connect(
-        on eventLoop: EventLoop,
+        on eventLoop: any EventLoop,
         configuration: PostgresConnection.Configuration,
         id connectionID: ID,
         logger: Logger
@@ -141,7 +141,7 @@ public final class PostgresConnection: @unchecked Sendable {
         connectionID: ID,
         configuration: PostgresConnection.InternalConfiguration,
         logger: Logger,
-        on eventLoop: EventLoop
+        on eventLoop: any EventLoop
     ) -> EventLoopFuture<PostgresConnection> {
 
         var mlogger = logger
@@ -156,7 +156,7 @@ public final class PostgresConnection: @unchecked Sendable {
         // on and the EventLoop. In addition, it eliminates all potential races between the creating
         // thread and the EventLoop.
         return eventLoop.flatSubmit { () -> EventLoopFuture<PostgresConnection> in
-            let connectFuture: EventLoopFuture<Channel>
+            let connectFuture: EventLoopFuture<any Channel>
 
             switch configuration.connection {
             case .resolved(let address):
@@ -190,9 +190,9 @@ public final class PostgresConnection: @unchecked Sendable {
     }
 
     static func makeBootstrap(
-        on eventLoop: EventLoop,
+        on eventLoop: any EventLoop,
         configuration: PostgresConnection.InternalConfiguration
-    ) -> NIOClientTCPBootstrapProtocol {
+    ) -> any NIOClientTCPBootstrapProtocol {
         #if canImport(Network)
         if let tsBootstrap = NIOTSConnectionBootstrap(validatingGroup: eventLoop) {
             return tsBootstrap.connectTimeout(configuration.options.connectTimeout)
@@ -295,7 +295,7 @@ extension PostgresConnection {
         tlsConfiguration: TLSConfiguration? = nil,
         serverHostname: String? = nil,
         logger: Logger = .init(label: "codes.vapor.postgres"),
-        on eventLoop: EventLoop
+        on eventLoop: any EventLoop
     ) -> EventLoopFuture<PostgresConnection> {
         var tlsFuture: EventLoopFuture<PostgresConnection.Configuration.TLS>
 
@@ -368,7 +368,7 @@ extension PostgresConnection {
     ///   - logger: A logger to log background events into
     /// - Returns: An established  ``PostgresConnection`` asynchronously that can be used to run queries.
     public static func connect(
-        on eventLoop: EventLoop = PostgresConnection.defaultEventLoopGroup.any(),
+        on eventLoop: any EventLoop = PostgresConnection.defaultEventLoopGroup.any(),
         configuration: PostgresConnection.Configuration,
         id connectionID: ID,
         logger: Logger
@@ -677,7 +677,7 @@ extension PostgresConnection {
 
 extension PostgresConnection: PostgresDatabase {
     public func send(
-        _ request: PostgresRequest,
+        _ request: any PostgresRequest,
         logger: Logger
     ) -> EventLoopFuture<Void> {
         guard let command = request as? PostgresCommands else {
@@ -832,7 +832,7 @@ extension PostgresConnection {
     /// Returns the default `EventLoopGroup` singleton, automatically selecting the best for the platform.
     ///
     /// This will select the concrete `EventLoopGroup` depending which platform this is running on.
-    public static var defaultEventLoopGroup: EventLoopGroup {
+    public static var defaultEventLoopGroup: any EventLoopGroup {
 #if canImport(Network)
         if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *) {
             return NIOTSEventLoopGroup.singleton

Sources/PostgresNIO/Connection/PostgresDatabase+PreparedQuery.swift

@@ -30,9 +30,9 @@ extension PostgresDatabase {
 
 public struct PreparedQuery: Sendable {
     let underlying: PSQLPreparedStatement
-    let database: PostgresDatabase
+    let database: any PostgresDatabase
 
-    init(underlying: PSQLPreparedStatement, database: PostgresDatabase) {
+    init(underlying: PSQLPreparedStatement, database: any PostgresDatabase) {
         self.underlying = underlying
         self.database = database
     }

Sources/PostgresNIO/New/Connection State Machine/ListenStateMachine.swift

@@ -26,7 +26,7 @@ struct ListenStateMachine {
         return self.channels[channel]!.startListeningSucceeded()
     }
 
-    mutating func startListeningFailed(channel: String, error: Error) -> Dictionary<Int, NotificationListener>.Values {
+    mutating func startListeningFailed(channel: String, error: any Error) -> Dictionary<Int, NotificationListener>.Values {
         return self.channels[channel]!.startListeningFailed(error)
     }
 
@@ -56,7 +56,7 @@ struct ListenStateMachine {
         return self.channels[channel]?.cancelListening(id: id) ?? .none
     }
 
-    mutating func fail(_ error: Error) -> [NotificationListener] {
+    mutating func fail(_ error: any Error) -> [NotificationListener] {
         var result = [NotificationListener]()
         while var (_, channel) = self.channels.popFirst() {
             switch channel.fail(error) {
@@ -89,7 +89,7 @@ extension ListenStateMachine {
             case starting([Int: NotificationListener])
             case listening([Int: NotificationListener])
             case stopping([Int: NotificationListener])
-            case failed(Error)
+            case failed(any Error)
         }
 
         private var state: State
@@ -143,7 +143,7 @@ extension ListenStateMachine {
             }
         }
 
-        mutating func startListeningFailed(_ error: Error) -> Dictionary<Int, NotificationListener>.Values {
+        mutating func startListeningFailed(_ error: any Error) -> Dictionary<Int, NotificationListener>.Values {
             switch self.state {
             case .initialized, .listening, .stopping:
                 fatalError("Invalid state: \(self.state)")
@@ -221,7 +221,7 @@ extension ListenStateMachine {
             case none
         }
 
-        mutating func fail(_ error: Error) -> FailAction {
+        mutating func fail(_ error: any Error) -> FailAction {
             switch self.state {
             case .initialized:
                 return .none

Sources/PostgresNIO/New/NotificationListener.swift

@@ -2,16 +2,16 @@ import NIOCore
 
 // This object is @unchecked Sendable, since we syncronize state on the EL
 final class NotificationListener: @unchecked Sendable {
-    let eventLoop: EventLoop
+    let eventLoop: any EventLoop
 
     let channel: String
     let id: Int
 
     private var state: State
 
     enum State {
-        case streamInitialized(CheckedContinuation<PostgresNotificationSequence, Error>)
-        case streamListening(AsyncThrowingStream<PostgresNotification, Error>.Continuation)
+        case streamInitialized(CheckedContinuation<PostgresNotificationSequence, any Error>)
+        case streamListening(AsyncThrowingStream<PostgresNotification, any Error>.Continuation)
 
         case closure(PostgresListenContext, (PostgresListenContext, PostgresMessage.NotificationResponse) -> Void)
         case done
@@ -31,8 +31,8 @@ final class NotificationListener: @unchecked Sendable {
     init(
         channel: String,
         id: Int,
-        eventLoop: EventLoop,
-        checkedContinuation: CheckedContinuation<PostgresNotificationSequence, Error>
+        eventLoop: any EventLoop,
+        checkedContinuation: CheckedContinuation<PostgresNotificationSequence, any Error>
     ) {
         self.channel = channel
         self.id = id
@@ -43,7 +43,7 @@ final class NotificationListener: @unchecked Sendable {
     init(
         channel: String,
         id: Int,
-        eventLoop: EventLoop,
+        eventLoop: any EventLoop,
         context: PostgresListenContext,
         closure: @Sendable @escaping (PostgresListenContext, PostgresMessage.NotificationResponse) -> Void
     ) {
@@ -109,7 +109,7 @@ final class NotificationListener: @unchecked Sendable {
         }
     }
 
-    func failed(_ error: Error) {
+    func failed(_ error: any Error) {
         self.eventLoop.preconditionInEventLoop()
 
         switch self.state {