minor: update linting tools versions (#49)

Update SwiftFormat to 0.47.3 and SwiftLint to 0.41.0 to match the driver

Author: patrickfreed

.evergreen/install-tools.sh

@@ -39,10 +39,10 @@ swiftenv local $SWIFT_VERSION
 
 if [ $1 == "swiftlint" ]
 then
-    build_from_gh swiftlint https://github.com/realm/SwiftLint "0.40.0"
+    build_from_gh swiftlint https://github.com/realm/SwiftLint "0.41.0"
 elif [ $1 == "swiftformat" ]
 then
-    build_from_gh swiftformat https://github.com/nicklockwood/SwiftFormat "0.44.13"
+    build_from_gh swiftformat https://github.com/nicklockwood/SwiftFormat "0.47.3"
 elif [ $1 == "sourcery" ]
 then
     install_from_gh sourcery https://github.com/krzysztofzablocki/Sourcery/releases/download/0.18.0/Sourcery-0.18.0.zip

.swiftformat

@@ -1,4 +1,5 @@
 --exclude .build/*,opt/*
+--exclude etc
 
 # unnecessary
 --disable andOperator
@@ -10,7 +11,7 @@
 --indent 4
 
 # 0..<3 vs 0 ..< 3
---nospaceoperators "..<","..."
+--nospaceoperators ...,..<
 
 # always want explicit acl
 --disable redundantExtensionACL
@@ -35,5 +36,8 @@
 # the ordering doesn't match linter's
 --disable specifiers
 
-# Temporary while library is implemented
---disable unusedArguments
+# conflicts with our Swiftlint explicit ACL rule
+--disable extensionAccessControl
+
+# creates non-compiling code on Swift 5.1
+--disable preferKeyPath

.swiftlint.yml

@@ -5,7 +5,9 @@ disabled_rules:
   - todo
   - type_body_length
   - type_name
+  - inclusive_language # disabled until we complete work for the "remove offensive terminology" project.
   - cyclomatic_complexity
+  - opening_brace # conflicts with SwiftFormat wrapMultilineStatementBraces
 
 opt_in_rules:
   - array_init

Sources/SwiftBSON/BSONDecimal128.swift

@@ -226,7 +226,8 @@ public struct BSONDecimal128: Equatable, Hashable, CustomStringConvertible {
 
         let decimalPartNSRange = match.range(at: REGroups.decimalPart.rawValue)
         guard decimalPartNSRange.location != NSNotFound,
-            let decimalPartRange = Range(decimalPartNSRange, in: data) else {
+              let decimalPartRange = Range(decimalPartNSRange, in: data)
+        else {
             throw BSONError.InvalidArgumentError(
                 message: "Syntax Error: \(data) Missing digits in front of the exponent"
             )

Sources/SwiftBSON/BSONDecoder.swift

@@ -800,7 +800,8 @@ private struct _BSONUnkeyedDecodingContainer: UnkeyedDecodingContainer {
 
     /// Decodes a nested container keyed by the given type.
     public mutating func nestedContainer<NestedKey: CodingKey>(keyedBy _: NestedKey.Type)
-        throws -> KeyedDecodingContainer<NestedKey> {
+        throws -> KeyedDecodingContainer<NestedKey>
+    {
         try self.decoder.with(pushedKey: _BSONKey(index: self.currentIndex)) {
             try self.checkAtEnd()
             let doc = try self.decodeBSONType(BSONDocument.self)

Sources/SwiftBSON/BSONEncoder.swift

@@ -676,7 +676,8 @@ private struct _BSONUnkeyedEncodingContainer: UnkeyedEncodingContainer {
     }
 
     public mutating func nestedContainer<NestedKey>(keyedBy _: NestedKey.Type)
-        -> KeyedEncodingContainer<NestedKey> {
+        -> KeyedEncodingContainer<NestedKey>
+    {
         self.codingPath.append(_BSONKey(index: self.count))
         defer { self.codingPath.removeLast() }
 
@@ -769,7 +770,7 @@ private class MutableArray: BSONValue {
 
     fileprivate init() {}
 
-    internal required init(fromExtJSON json: JSON, keyPath: [String]) throws {
+    internal required init(fromExtJSON _: JSON, keyPath _: [String]) throws {
         fatalError("MutableArray: BSONValue.init(fromExtJSON) should be unused")
     }
 
@@ -783,11 +784,11 @@ private class MutableArray: BSONValue {
 
     /// methods required by the BSONValue protocol that we don't actually need/use. MutableArray
     /// is just a BSONValue to simplify usage alongside true BSONValues within the encoder.
-    static func read(from buffer: inout ByteBuffer) throws -> BSON {
+    static func read(from _: inout ByteBuffer) throws -> BSON {
         fatalError("MutableArray is not meant to be read from a ByteBuffer")
     }
 
-    func write(to buffer: inout ByteBuffer) {
+    func write(to _: inout ByteBuffer) {
         fatalError("MutableArray is not meant to be written to a ByteBuffer")
     }
 
@@ -865,7 +866,7 @@ private class MutableDictionary: BSONValue {
 
     fileprivate init() {}
 
-    internal required init?(fromExtJSON json: JSON, keyPath: [String]) throws {
+    internal required init?(fromExtJSON _: JSON, keyPath _: [String]) throws {
         fatalError("MutableDictionary: BSONValue.init(fromExtJSON) should be unused")
     }
 
@@ -879,11 +880,11 @@ private class MutableDictionary: BSONValue {
 
     /// methods required by the BSONValue protocol that we don't actually need/use. MutableDictionary
     /// is just a BSONValue to simplify usage alongside true BSONValues within the encoder.
-    static func read(from buffer: inout ByteBuffer) throws -> BSON {
+    static func read(from _: inout ByteBuffer) throws -> BSON {
         fatalError("MutableDictionary is not meant to be read from a ByteBuffer")
     }
 
-    func write(to buffer: inout ByteBuffer) {
+    func write(to _: inout ByteBuffer) {
         fatalError("MutableDictionary is not meant to be encoded to a ByteBuffer")
     }
 

Sources/SwiftBSON/BSONNulls.swift

@@ -14,7 +14,7 @@ internal struct BSONNull: BSONValue, Equatable {
      *   - `nil` if the provided value is not `null`.
      *
      */
-    internal init?(fromExtJSON json: JSON, keyPath: [String]) {
+    internal init?(fromExtJSON json: JSON, keyPath _: [String]) {
         switch json {
         case .null:
             // canonical or relaxed extended JSON
@@ -41,11 +41,11 @@ internal struct BSONNull: BSONValue, Equatable {
     /// Initializes a new `BSONNull` instance.
     internal init() {}
 
-    internal static func read(from: inout ByteBuffer) throws -> BSON {
+    internal static func read(from _: inout ByteBuffer) throws -> BSON {
         .null
     }
 
-    internal func write(to: inout ByteBuffer) {
+    internal func write(to _: inout ByteBuffer) {
         // no-op
     }
 }
@@ -97,11 +97,11 @@ internal struct BSONUndefined: BSONValue, Equatable {
     /// Initializes a new `BSONUndefined` instance.
     internal init() {}
 
-    internal static func read(from: inout ByteBuffer) throws -> BSON {
+    internal static func read(from _: inout ByteBuffer) throws -> BSON {
         .undefined
     }
 
-    internal func write(to: inout ByteBuffer) {
+    internal func write(to _: inout ByteBuffer) {
         // no-op
     }
 }
@@ -153,11 +153,11 @@ internal struct BSONMinKey: BSONValue, Equatable {
     /// Initializes a new `MinKey` instance.
     internal init() {}
 
-    internal static func read(from: inout ByteBuffer) throws -> BSON {
+    internal static func read(from _: inout ByteBuffer) throws -> BSON {
         .minKey
     }
 
-    internal func write(to: inout ByteBuffer) {
+    internal func write(to _: inout ByteBuffer) {
         // no-op
     }
 }
@@ -209,11 +209,11 @@ internal struct BSONMaxKey: BSONValue, Equatable {
     /// Initializes a new `MaxKey` instance.
     internal init() {}
 
-    internal static func read(from: inout ByteBuffer) throws -> BSON {
+    internal static func read(from _: inout ByteBuffer) throws -> BSON {
         .maxKey
     }
 
-    internal func write(to: inout ByteBuffer) {
+    internal func write(to _: inout ByteBuffer) {
         // no-op
     }
 }

Sources/SwiftBSON/Bool+BSONValue.swift

@@ -12,7 +12,7 @@ extension Bool: BSONValue {
      * Returns:
      *   - `nil` if the provided value is not a `Bool`.
      */
-    internal init?(fromExtJSON json: JSON, keyPath: [String]) {
+    internal init?(fromExtJSON json: JSON, keyPath _: [String]) {
         switch json {
         case let .bool(b):
             // canonical or relaxed extended JSON

Sources/SwiftBSON/ExtendedJSONDecoder.swift

@@ -27,7 +27,7 @@ public class ExtendedJSONDecoder {
     ///   - data: `Data` which represents the JSON that will be decoded.
     /// - Returns: Decoded representation of the JSON input as an instance of `T`.
     /// - Throws: `DecodingError` if the JSON data is corrupt or if any value throws an error during decoding.
-    public func decode<T: Decodable>(_ type: T.Type, from data: Data) throws -> T {
+    public func decode<T: Decodable>(_: T.Type, from data: Data) throws -> T {
         // Data --> JSON --> BSON --> T
         // Takes in JSON as `Data` encoded with `.utf8` and runs it through a `JSONDecoder` to get an
         // instance of the `JSON` enum.

Sources/SwiftBSON/String+BSONValue.swift

@@ -12,7 +12,7 @@ extension String: BSONValue {
      * Returns:
      *   - `nil` if the provided value is not an `String`.
      */
-    internal init?(fromExtJSON json: JSON, keyPath: [String]) {
+    internal init?(fromExtJSON json: JSON, keyPath _: [String]) {
         switch json {
         case let .string(s):
             self = s