Skip to content

Commit ad0cdd1

Browse files
committed
formatting
1 parent 9b37636 commit ad0cdd1

File tree

74 files changed

+1877
-1574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1877
-1574
lines changed

.licenseignore

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
.gitignore
2+
**/.gitignore
3+
.licenseignore
4+
.gitattributes
5+
.git-blame-ignore-revs
6+
.mailfilter
7+
.mailmap
8+
.spi.yml
9+
.swift-format
10+
.editorconfig
11+
.github/*
12+
*.md
13+
*.txt
14+
*.yml
15+
*.yaml
16+
*.json
17+
Package.swift
18+
**/Package.swift
19+
Package@-*.swift
20+
**/Package@-*.swift
21+
Package.resolved
22+
**/Package.resolved
23+
Makefile
24+
*.modulemap
25+
**/*.modulemap
26+
**/*.docc/*
27+
*.xcprivacy
28+
**/*.xcprivacy
29+
*.symlink
30+
**/*.symlink
31+
Dockerfile
32+
**/Dockerfile
33+
Snippets/*
34+
dev/git.commit.template
35+
.unacceptablelanguageignore
36+
IntegrationTests/*.sh

Package.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ let package = Package(
2020
products: [
2121
.library(name: "RediStack", targets: ["RediStack"]),
2222
.library(name: "RediStackTestUtils", targets: ["RediStackTestUtils"]),
23-
.library(name: "RedisTypes", targets: ["RedisTypes"])
23+
.library(name: "RedisTypes", targets: ["RedisTypes"]),
2424
],
2525
dependencies: [
2626
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.1.0"),
2727
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
28-
.package(url: "https://github.com/apple/swift-metrics.git", "1.0.0" ..< "3.0.0"),
28+
.package(url: "https://github.com/apple/swift-metrics.git", "1.0.0"..<"3.0.0"),
2929
.package(url: "https://github.com/apple/swift-nio.git", from: "2.43.0"),
3030
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.23.1"),
3131
],
@@ -40,7 +40,7 @@ let package = Package(
4040
.product(name: "NIOSSL", package: "swift-nio-ssl"),
4141
.product(name: "Atomics", package: "swift-atomics"),
4242
.product(name: "Logging", package: "swift-log"),
43-
.product(name: "Metrics", package: "swift-metrics")
43+
.product(name: "Metrics", package: "swift-metrics"),
4444
]
4545
),
4646
.target(name: "RedisTypes", dependencies: ["RediStack"]),
@@ -49,13 +49,13 @@ let package = Package(
4949
dependencies: [
5050
.product(name: "NIOCore", package: "swift-nio"),
5151
.product(name: "NIOEmbedded", package: "swift-nio"),
52-
"RediStack"
52+
"RediStack",
5353
]
5454
),
5555
.target(
5656
name: "RESP3",
5757
dependencies: [
58-
.product(name: "NIOCore", package: "swift-nio"),
58+
.product(name: "NIOCore", package: "swift-nio")
5959
]
6060
),
6161
.testTarget(
@@ -65,14 +65,14 @@ let package = Package(
6565
"RediStackTestUtils",
6666
.product(name: "Atomics", package: "swift-atomics"),
6767
.product(name: "NIO", package: "swift-nio"),
68-
.product(name: "NIOTestUtils", package: "swift-nio")
68+
.product(name: "NIOTestUtils", package: "swift-nio"),
6969
]
7070
),
7171
.testTarget(
7272
name: "RedisTypesTests",
7373
dependencies: [
7474
"RediStack", "RedisTypes", "RediStackTestUtils",
75-
.product(name: "NIO", package: "swift-nio")
75+
.product(name: "NIO", package: "swift-nio"),
7676
]
7777
),
7878
.testTarget(
@@ -88,8 +88,8 @@ let package = Package(
8888
name: "RediStackIntegrationTests",
8989
dependencies: [
9090
"RediStack", "RediStackTestUtils",
91-
.product(name: "NIO", package: "swift-nio")
91+
.product(name: "NIO", package: "swift-nio"),
9292
]
93-
)
93+
),
9494
]
9595
)

Sources/RESP3/RESP3Token.swift

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public struct RESP3Token: Hashable, Sendable {
3535
}
3636

3737
public mutating func next() -> RESP3Token? {
38-
return try! RESP3Token(consuming: &self.buffer)
38+
try! RESP3Token(consuming: &self.buffer)
3939
}
4040
}
4141
}
@@ -194,19 +194,19 @@ public struct RESP3Token: Hashable, Sendable {
194194
validated = try buffer.readRESPBooleanSlice()
195195

196196
case .some(.blobString),
197-
.some(.verbatimString),
198-
.some(.blobError):
197+
.some(.verbatimString),
198+
.some(.blobError):
199199
validated = try buffer.readRESPBlobStringSlice()
200200

201201
case .some(.simpleString),
202-
.some(.simpleError):
202+
.some(.simpleError):
203203
validated = try buffer.readRESPSimpleStringSlice()
204204

205205
case .some(.array),
206-
.some(.push),
207-
.some(.set),
208-
.some(.map),
209-
.some(.attribute):
206+
.some(.push),
207+
.some(.set),
208+
.some(.map),
209+
.some(.attribute):
210210
validated = try buffer.readRESPAggregateSlice(depth: depth)
211211

212212
case .some(.integer):
@@ -514,4 +514,3 @@ extension UInt32 {
514514
return value
515515
}()
516516
}
517-

Sources/RESP3/RESP3TypeIdentifier.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
enum RESP3TypeIdentifier: UInt8 {
16-
case integer = 58 // UInt8(ascii: ":")
17-
case double = 44 // UInt8.comma
18-
case simpleString = 43 // UInt8.plus
19-
case simpleError = 45 // UInt8.min
20-
case blobString = 36 // UInt8.dollar
21-
case blobError = 33 // UInt8.exclamationMark
22-
case verbatimString = 61 // UInt8.equals
23-
case boolean = 35 // UInt8.pound
24-
case null = 95 // UInt8.underscore
25-
case bigNumber = 40 // UInt8.leftRoundBracket
26-
case array = 42 // UInt8.asterisk
27-
case map = 37 // UInt8.percent
28-
case set = 126 // UInt8.tilde
29-
case attribute = 124 // UInt8.pipe
30-
case push = 62 // UInt8.rightAngledBracket
16+
case integer = 58 // UInt8(ascii: ":")
17+
case double = 44 // UInt8.comma
18+
case simpleString = 43 // UInt8.plus
19+
case simpleError = 45 // UInt8.min
20+
case blobString = 36 // UInt8.dollar
21+
case blobError = 33 // UInt8.exclamationMark
22+
case verbatimString = 61 // UInt8.equals
23+
case boolean = 35 // UInt8.pound
24+
case null = 95 // UInt8.underscore
25+
case bigNumber = 40 // UInt8.leftRoundBracket
26+
case array = 42 // UInt8.asterisk
27+
case map = 37 // UInt8.percent
28+
case set = 126 // UInt8.tilde
29+
case attribute = 124 // UInt8.pipe
30+
case push = 62 // UInt8.rightAngledBracket
3131
}
3232

3333
extension UInt8 {

Sources/RediStack/ChannelHandlers/RedisByteDecoder.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import NIOCore
2121
public final class RedisByteDecoder: NIOSingleStepByteToMessageDecoder {
2222
/// `ByteToMessageDecoder.InboundOut`
2323
public typealias InboundOut = RESPValue
24-
24+
2525
private let parser: RESPTranslator
26-
26+
2727
public init() {
2828
self.parser = RESPTranslator()
2929
}

Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ public final class RedisCommandHandler {
4141

4242
deinit {
4343
if !self.commandResponseQueue.isEmpty {
44-
assertionFailure("Command handler deinit when queue is not empty! Queue size: \(self.commandResponseQueue.count)")
44+
assertionFailure(
45+
"Command handler deinit when queue is not empty! Queue size: \(self.commandResponseQueue.count)"
46+
)
4547
}
4648
}
4749

@@ -51,7 +53,7 @@ public final class RedisCommandHandler {
5153
public init(initialQueueCapacity: Int = 3) {
5254
self.commandResponseQueue = CircularBuffer(initialCapacity: initialQueueCapacity)
5355
}
54-
56+
5557
private enum State {
5658
case `default`
5759
case draining(EventLoopPromise<Void>?)
@@ -74,7 +76,7 @@ extension RedisCommandHandler: ChannelInboundHandler {
7476
self._failCommandQueue(because: error)
7577
context.close(promise: nil)
7678
}
77-
79+
7880
/// Invoked by SwiftNIO when the channel's active state has changed, such as when it is closed. The command queue will be drained
7981
/// with each promise in the queue being failed from a connection closed error.
8082
///
@@ -84,7 +86,7 @@ extension RedisCommandHandler: ChannelInboundHandler {
8486
self.state = .error(RedisClientError.connectionClosed)
8587
self._failCommandQueue(because: RedisClientError.connectionClosed)
8688
}
87-
89+
8890
private func _failCommandQueue(because error: Error) {
8991
self.state = .error(error)
9092
let queue = self.commandResponseQueue
@@ -141,14 +143,14 @@ extension RedisCommandHandler: ChannelOutboundHandler {
141143
/// See `NIO.ChannelOutboundHandler.write(context:data:promise:)`
142144
public func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {
143145
let commandContext = self.unwrapOutboundIn(data)
144-
146+
145147
switch self.state {
146148
case let .error(e):
147149
commandContext.responsePromise.fail(e)
148150

149151
case .draining:
150152
commandContext.responsePromise.fail(RedisClientError.connectionClosed)
151-
153+
152154
case .default:
153155
self.commandResponseQueue.append(commandContext.responsePromise)
154156
context.write(

Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import NIOCore
1717
#if DEBUG
1818
// used only for debugging purposes where we build a formatted string for the encoded bytes
1919
private func getPrintableString(for buffer: inout ByteBuffer) -> String {
20-
return String(describing: buffer.getString(at: 0, length: buffer.readableBytes))
20+
String(describing: buffer.getString(at: 0, length: buffer.readableBytes))
2121
.dropFirst(9)
2222
.dropLast()
2323
.description
@@ -31,7 +31,7 @@ public final class RedisMessageEncoder: MessageToByteEncoder {
3131
/// See `MessageToByteEncoder.OutboundIn`
3232
public typealias OutboundIn = RESPValue
3333

34-
public init() { }
34+
public init() {}
3535

3636
/// Encodes the `RedisValue` to bytes, following the RESP specification.
3737
///

0 commit comments

Comments
 (0)