formatting

Author: ktoso

.github/workflows/pull_request.yml

@@ -9,7 +9,7 @@ jobs:
     name: Soundness
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
-      license_header_check_project_name: "RediStack"
+      license_header_check_project_name: "Apple Inc. and the RediStack"
 
   unit-tests:
     name: Unit tests

.licenseignore

@@ -0,0 +1,36 @@
+.gitignore
+**/.gitignore
+.licenseignore
+.gitattributes
+.git-blame-ignore-revs
+.mailfilter
+.mailmap
+.spi.yml
+.swift-format
+.editorconfig
+.github/*
+*.md
+*.txt
+*.yml
+*.yaml
+*.json
+Package.swift
+**/Package.swift
+Package@-*.swift
+**/Package@-*.swift
+Package.resolved
+**/Package.resolved
+Makefile
+*.modulemap
+**/*.modulemap
+**/*.docc/*
+*.xcprivacy
+**/*.xcprivacy
+*.symlink
+**/*.symlink
+Dockerfile
+**/Dockerfile
+Snippets/*
+dev/git.commit.template
+.unacceptablelanguageignore
+IntegrationTests/*.sh

Package.swift

@@ -20,12 +20,12 @@ let package = Package(
     products: [
         .library(name: "RediStack", targets: ["RediStack"]),
         .library(name: "RediStackTestUtils", targets: ["RediStackTestUtils"]),
-        .library(name: "RedisTypes", targets: ["RedisTypes"])
+        .library(name: "RedisTypes", targets: ["RedisTypes"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-atomics.git", from: "1.1.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-metrics.git", "1.0.0" ..< "3.0.0"),
+        .package(url: "https://github.com/apple/swift-metrics.git", "1.0.0"..<"3.0.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.43.0"),
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.23.1"),
     ],
@@ -40,7 +40,7 @@ let package = Package(
                 .product(name: "NIOSSL", package: "swift-nio-ssl"),
                 .product(name: "Atomics", package: "swift-atomics"),
                 .product(name: "Logging", package: "swift-log"),
-                .product(name: "Metrics", package: "swift-metrics")
+                .product(name: "Metrics", package: "swift-metrics"),
             ]
         ),
         .target(name: "RedisTypes", dependencies: ["RediStack"]),
@@ -49,13 +49,13 @@ let package = Package(
             dependencies: [
                 .product(name: "NIOCore", package: "swift-nio"),
                 .product(name: "NIOEmbedded", package: "swift-nio"),
-                "RediStack"
+                "RediStack",
             ]
         ),
         .target(
             name: "RESP3",
             dependencies: [
-                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio")
             ]
         ),
         .testTarget(
@@ -65,14 +65,14 @@ let package = Package(
                 "RediStackTestUtils",
                 .product(name: "Atomics", package: "swift-atomics"),
                 .product(name: "NIO", package: "swift-nio"),
-                .product(name: "NIOTestUtils", package: "swift-nio")
+                .product(name: "NIOTestUtils", package: "swift-nio"),
             ]
         ),
         .testTarget(
             name: "RedisTypesTests",
             dependencies: [
                 "RediStack", "RedisTypes", "RediStackTestUtils",
-                .product(name: "NIO", package: "swift-nio")
+                .product(name: "NIO", package: "swift-nio"),
             ]
         ),
         .testTarget(
@@ -88,8 +88,8 @@ let package = Package(
             name: "RediStackIntegrationTests",
             dependencies: [
                 "RediStack", "RediStackTestUtils",
-                .product(name: "NIO", package: "swift-nio")
+                .product(name: "NIO", package: "swift-nio"),
             ]
-        )
+        ),
     ]
 )

Sources/RESP3/RESP3Token.swift

@@ -35,7 +35,7 @@ public struct RESP3Token: Hashable, Sendable {
             }
 
             public mutating func next() -> RESP3Token? {
-                return try! RESP3Token(consuming: &self.buffer)
+                try! RESP3Token(consuming: &self.buffer)
             }
         }
     }
@@ -194,19 +194,19 @@ public struct RESP3Token: Hashable, Sendable {
             validated = try buffer.readRESPBooleanSlice()
 
         case .some(.blobString),
-             .some(.verbatimString),
-             .some(.blobError):
+            .some(.verbatimString),
+            .some(.blobError):
             validated = try buffer.readRESPBlobStringSlice()
 
         case .some(.simpleString),
-             .some(.simpleError):
+            .some(.simpleError):
             validated = try buffer.readRESPSimpleStringSlice()
 
         case .some(.array),
-             .some(.push),
-             .some(.set),
-             .some(.map),
-             .some(.attribute):
+            .some(.push),
+            .some(.set),
+            .some(.map),
+            .some(.attribute):
             validated = try buffer.readRESPAggregateSlice(depth: depth)
 
         case .some(.integer):
@@ -514,4 +514,3 @@ extension UInt32 {
         return value
     }()
 }
-

Sources/RESP3/RESP3TypeIdentifier.swift

@@ -13,21 +13,21 @@
 //===----------------------------------------------------------------------===//
 
 enum RESP3TypeIdentifier: UInt8 {
-    case integer = 58 // UInt8(ascii: ":")
-    case double = 44 // UInt8.comma
-    case simpleString = 43 // UInt8.plus
-    case simpleError = 45 // UInt8.min
-    case blobString = 36 // UInt8.dollar
-    case blobError = 33 // UInt8.exclamationMark
-    case verbatimString = 61 // UInt8.equals
-    case boolean = 35 // UInt8.pound
-    case null = 95 // UInt8.underscore
-    case bigNumber = 40 // UInt8.leftRoundBracket
-    case array = 42 // UInt8.asterisk
-    case map = 37 // UInt8.percent
-    case set = 126 // UInt8.tilde
-    case attribute = 124 // UInt8.pipe
-    case push = 62 // UInt8.rightAngledBracket
+    case integer = 58  // UInt8(ascii: ":")
+    case double = 44  // UInt8.comma
+    case simpleString = 43  // UInt8.plus
+    case simpleError = 45  // UInt8.min
+    case blobString = 36  // UInt8.dollar
+    case blobError = 33  // UInt8.exclamationMark
+    case verbatimString = 61  // UInt8.equals
+    case boolean = 35  // UInt8.pound
+    case null = 95  // UInt8.underscore
+    case bigNumber = 40  // UInt8.leftRoundBracket
+    case array = 42  // UInt8.asterisk
+    case map = 37  // UInt8.percent
+    case set = 126  // UInt8.tilde
+    case attribute = 124  // UInt8.pipe
+    case push = 62  // UInt8.rightAngledBracket
 }
 
 extension UInt8 {

Sources/RediStack/ChannelHandlers/RedisByteDecoder.swift

@@ -21,9 +21,9 @@ import NIOCore
 public final class RedisByteDecoder: NIOSingleStepByteToMessageDecoder {
     /// `ByteToMessageDecoder.InboundOut`
     public typealias InboundOut = RESPValue
-    
+
     private let parser: RESPTranslator
-    
+
     public init() {
         self.parser = RESPTranslator()
     }

Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift

@@ -41,7 +41,9 @@ public final class RedisCommandHandler {
 
     deinit {
         if !self.commandResponseQueue.isEmpty {
-            assertionFailure("Command handler deinit when queue is not empty! Queue size: \(self.commandResponseQueue.count)")
+            assertionFailure(
+                "Command handler deinit when queue is not empty! Queue size: \(self.commandResponseQueue.count)"
+            )
         }
     }
 
@@ -51,7 +53,7 @@ public final class RedisCommandHandler {
     public init(initialQueueCapacity: Int = 3) {
         self.commandResponseQueue = CircularBuffer(initialCapacity: initialQueueCapacity)
     }
-    
+
     private enum State {
         case `default`
         case draining(EventLoopPromise<Void>?)
@@ -74,7 +76,7 @@ extension RedisCommandHandler: ChannelInboundHandler {
         self._failCommandQueue(because: error)
         context.close(promise: nil)
     }
-    
+
     /// Invoked by SwiftNIO when the channel's active state has changed, such as when it is closed. The command queue will be drained
     ///     with each promise in the queue being failed from a connection closed error.
     ///
@@ -84,7 +86,7 @@ extension RedisCommandHandler: ChannelInboundHandler {
         self.state = .error(RedisClientError.connectionClosed)
         self._failCommandQueue(because: RedisClientError.connectionClosed)
     }
-    
+
     private func _failCommandQueue(because error: Error) {
         self.state = .error(error)
         let queue = self.commandResponseQueue
@@ -141,14 +143,14 @@ extension RedisCommandHandler: ChannelOutboundHandler {
     /// See `NIO.ChannelOutboundHandler.write(context:data:promise:)`
     public func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {
         let commandContext = self.unwrapOutboundIn(data)
-        
+
         switch self.state {
         case let .error(e):
             commandContext.responsePromise.fail(e)
 
         case .draining:
             commandContext.responsePromise.fail(RedisClientError.connectionClosed)
-            
+
         case .default:
             self.commandResponseQueue.append(commandContext.responsePromise)
             context.write(

Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift

@@ -17,7 +17,7 @@ import NIOCore
 #if DEBUG
 // used only for debugging purposes where we build a formatted string for the encoded bytes
 private func getPrintableString(for buffer: inout ByteBuffer) -> String {
-    return String(describing: buffer.getString(at: 0, length: buffer.readableBytes))
+    String(describing: buffer.getString(at: 0, length: buffer.readableBytes))
         .dropFirst(9)
         .dropLast()
         .description
@@ -31,7 +31,7 @@ public final class RedisMessageEncoder: MessageToByteEncoder {
     /// See `MessageToByteEncoder.OutboundIn`
     public typealias OutboundIn = RESPValue
 
-    public init() { }
+    public init() {}
 
     /// Encodes the `RedisValue` to bytes, following the RESP specification.
     ///