formatting fixes

Author: ktoso

Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift

@@ -91,7 +91,9 @@ extension RedisCommandHandler: ChannelInboundHandler {
         self.state = .error(error)
         let queue = self.commandResponseQueue
         self.commandResponseQueue.removeAll()
-        queue.forEach { $0.fail(error) }
+        for element in queue {
+            element.fail(error)
+        }
     }
 
     /// Invoked by SwiftNIO when a read has been fired from earlier in the response chain.

Sources/RediStack/ChannelHandlers/RedisPubSubHandler.swift

@@ -310,10 +310,12 @@ extension RedisPubSubHandler {
 
         // create them
         let pendingSubscriptions: [(String, EventLoopPromise<Int>)] = targets.map {
-            return (self.prefixKey($0, with: keyPrefix), self.eventLoop.makePromise())
+            (self.prefixKey($0, with: keyPrefix), self.eventLoop.makePromise())
         }
         // add the subscription change handler to the appropriate queue for each individual subscription target
-        pendingSubscriptions.forEach { self[keyPath: pendingQueue].updateValue($1, forKey: $0) }
+        for (key, value) in pendingSubscriptions {
+            self[keyPath: pendingQueue].updateValue(value, forKey: key)
+        }
 
         // synchronize all of the individual subscription changes
         let subscriptionCountFuture = EventLoopFuture<Int>
@@ -480,9 +482,9 @@ extension RedisPubSubHandler: ChannelInboundHandler {
 
         let receivers = self.subscriptions
         self.subscriptions.removeAll()
-        receivers.forEach {
-            $0.value.onUnsubscribe?($0.key, 0)
-            $0.value.type.gauge.decrement()
+        for receiver in receivers {
+            receiver.value.onUnsubscribe?(receiver.key, 0)
+            receiver.value.type.gauge.decrement()
         }
     }
 }

Sources/RediStack/Cluster/RedisClusterShardDescriptionProtocol.swift

@@ -18,7 +18,7 @@ public protocol RedisClusterShardDescriptionProtocol: Identifiable, Sendable {
     associatedtype NodeDescription: RedisClusterNodeDescriptionProtocol
 
     /// The shard's primary node
-    var master: NodeDescription { get } // #ignore-unacceptable-language
+    var master: NodeDescription { get }  // #ignore-unacceptable-language
 
     /// The shard's replica nodes
     var replicas: [NodeDescription] { get }

Sources/RediStack/Commands/BasicCommands.swift

@@ -251,7 +251,7 @@ extension RedisClient {
         }
         let elements =
             response
-            .map { return $0[1] }
+            .map { $0[1] }
             .tryConverting(to: resultType)
 
         return position.and(elements)

Sources/RediStack/ConnectionPool/RedisConnectionPool+Configuration.swift

@@ -138,7 +138,7 @@ extension RedisConnectionPool {
                 connectionRetryTimeout ?? .milliseconds(10)  // always default to a baseline 10ms
             )
             self.onUnexpectedConnectionClose = onUnexpectedConnectionClose
-            self.poolDefaultLogger = poolDefaultLogger ?? .redisBaseConnectionPoolLogger
+            self.poolDefaultLogger = poolDefaultLogger ?? .redisBaseConnectionPool
         }
     }
 }

Sources/RediStack/RESP/RESPTranslator.swift

@@ -68,7 +68,9 @@ extension ByteBuffer {
             self.writeStaticString("*")
             self.writeString("\(array.count)")
             self.writeStaticString(respEnd)
-            array.forEach { self.writeRESPValue($0) }
+            for element in array {
+                self.writeRESPValue(element)
+            }
         }
     }
 }

Sources/RediStack/RESP/RESPValue.swift

@@ -207,7 +207,9 @@ extension RangeReplaceableCollection where Element == RESPValue {
         guard elementsToCopy.count > 0 else { return }
 
         self.reserveCapacity(self.count + elementsToCopy.count)
-        elementsToCopy.forEach { self.append($0.convertedToRESPValue()) }
+        for element in elementsToCopy {
+            self.append(element.convertedToRESPValue())
+        }
     }
 
     /// Adds the elements of a collection to this array, delegating the details of how they are added to the given closure.
@@ -254,7 +256,9 @@ extension RangeReplaceableCollection where Element == RESPValue {
         let sizeToAdd = overestimatedCountBeingAdded ?? elementsToCopy.count
         self.reserveCapacity(self.count + sizeToAdd)
 
-        elementsToCopy.forEach { closure(&self, $0) }
+        for element in elementsToCopy {
+            closure(&self, element)
+        }
     }
 }
 

Sources/RediStack/RedisClient.swift

@@ -267,7 +267,7 @@ public struct RedisClientError: LocalizedError, Equatable, Hashable {
 
     private init(_ baseError: BaseError) { self.baseError = baseError }
 
-    /* Protocol Conformances and Private Type implementation */
+    // Protocol Conformances and Private Type implementation
 
     public static func == (lhs: RedisClientError, rhs: RedisClientError) -> Bool {
         lhs.localizedDescription == rhs.localizedDescription

Sources/RediStack/RedisConnection+Configuration.swift

@@ -43,7 +43,7 @@ extension RedisConnection {
             }
         }
 
-        internal static let defaultLogger = Logger.redisBaseConnectionLogger
+        internal static let defaultLogger = Logger.redisBaseConnection
 
         /// The hostname of the connection address. If the address is a Unix socket, then it will be `nil`.
         public var hostname: String? {

Sources/RediStack/RedisLogging.swift

@@ -60,9 +60,9 @@ public enum RedisLogging {
 
 extension Logger {
     /// The prototypical instance used for Redis connections.
-    public static var redisBaseConnectionLogger: Logger { RedisLogging.baseConnectionLogger }
+    public static var redisBaseConnection: Logger { RedisLogging.baseConnectionLogger }
     /// The prototypical instance used for Redis connection pools.
-    public static var redisBaseConnectionPoolLogger: Logger { RedisLogging.baseConnectionPoolLogger }
+    public static var redisBaseConnectionPool: Logger { RedisLogging.baseConnectionPoolLogger }
 }
 
 // MARK: Protocol-based Context Passing