Swift Format 0.48.17 (#111)

hummingbird-project · Oct 30, 2021 · 70d4d9c · 70d4d9c
1 parent 6ea037d
commit 70d4d9c
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
@@ -16,6 +16,6 @@ jobs:
     - name: Install Dependencies
       run: |
         brew install mint
-        mint install NickLockwood/SwiftFormat@0.47.13 --no-link
+        mint install NickLockwood/SwiftFormat@0.48.17 --no-link
     - name: run script
       run: ./scripts/sanity.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -30,4 +30,4 @@ The main development branch of the repository is  `main`.
 
 ### Formatting
 
-We use Nick Lockwood's SwiftFormat for formatting code. PRs will not be accepted if they haven't be formatted. The current version of SwiftFormat we are using is v0.47.13.
+We use Nick Lockwood's SwiftFormat for formatting code. PRs will not be accepted if they haven't be formatted. The current version of SwiftFormat we are using is v0.48.17.
diff --git a/Sources/Hummingbird/Router/TrieRouter.swift b/Sources/Hummingbird/Router/TrieRouter.swift
@@ -113,7 +113,7 @@ struct RouterPathTrie<Value> {
                 return child
             }
             let node = Node(key: key, output: output)
-            children.append(node)
+            self.children.append(node)
             return node
         }
 

diff --git a/Tests/HummingbirdFoundationTests/URLEncodedForm/URLDecoderTests.swift b/Tests/HummingbirdFoundationTests/URLEncodedForm/URLDecoderTests.swift
@@ -36,7 +36,7 @@ class URLDecodedFormDecoderTests: XCTestCase {
             }
         }
         let test = Test(a: "Testing", b: 42)
-        testForm(test, query: "A=Testing&B=42")
+        self.testForm(test, query: "A=Testing&B=42")
     }
 
     func testNumbers() {
@@ -56,7 +56,7 @@ class URLDecodedFormDecoderTests: XCTestCase {
             let d: Double
         }
         let test = Test(b: true, i: 34, i8: 23, i16: 9, i32: -6872, i64: 23, u: 0, u8: 255, u16: 7673, u32: 88222, u64: 234, f: -1.1, d: 8)
-        testForm(test, query: "b=true&i=34&i8=23&i16=9&i32=-6872&i64=23&u=0&u8=255&u16=7673&u32=88222&u64=234&f=-1.1&d=8")
+        self.testForm(test, query: "b=true&i=34&i8=23&i16=9&i32=-6872&i64=23&u=0&u8=255&u16=7673&u32=88222&u64=234&f=-1.1&d=8")
     }
 
     func testNumberArrays() {
@@ -76,15 +76,15 @@ class URLDecodedFormDecoderTests: XCTestCase {
             let d: [Double]
         }
         let test = Test(b: [true, false], i: [34], i8: [23], i16: [9], i32: [-6872], i64: [23], u: [0], u8: [255], u16: [7673], u32: [88222], u64: [234], f: [-1.1], d: [8])
-        testForm(test, query: "b[]=true&b[]=false&i[]=34&i8[]=23&i16[]=9&i32[]=-6872&i64[]=23&u[]=0&u8[]=255&u16[]=7673&u32[]=88222&u64[]=234&f[]=-1.1&d[]=8")
+        self.testForm(test, query: "b[]=true&b[]=false&i[]=34&i8[]=23&i16[]=9&i32[]=-6872&i64[]=23&u[]=0&u8[]=255&u16[]=7673&u32[]=88222&u64[]=234&f[]=-1.1&d[]=8")
     }
 
     func testStringSpecialCharactersDecode() {
         struct Test: Codable, Equatable {
             let a: String
         }
         let test = Test(a: "adam+!@£$%^&*()_=")
-        testForm(test, query: "a=adam%2B%21%40%C2%A3%24%25%5E%26%2A%28%29_%3D")
+        self.testForm(test, query: "a=adam%2B%21%40%C2%A3%24%25%5E%26%2A%28%29_%3D")
     }
 
     func testContainingStructureDecode() {
@@ -96,7 +96,7 @@ class URLDecodedFormDecoderTests: XCTestCase {
             let t: Test
         }
         let test = Test2(t: Test(a: 42, b: "Life"))
-        testForm(test, query: "t[a]=42&t[b]=Life")
+        self.testForm(test, query: "t[a]=42&t[b]=Life")
     }
 
     func testEnumDecode() {
@@ -110,23 +110,23 @@ class URLDecodedFormDecoderTests: XCTestCase {
         }
         let test = Test(a: .second)
         // NB enum names don't change to rawValue (not sure how to fix)
-        testForm(test, query: "a=second")
+        self.testForm(test, query: "a=second")
     }
 
     func testArrayDecode() {
         struct Test: Codable, Equatable {
             let a: [Int16]
         }
         let test = Test(a: [9, 8, 7, 6])
-        testForm(test, query: "a[]=9&a[]=8&a[]=7&a[]=6")
+        self.testForm(test, query: "a[]=9&a[]=8&a[]=7&a[]=6")
     }
 
     func testDictionaryDecode() {
         struct Test: Codable, Equatable {
             let a: [String: Int]
         }
         let test = Test(a: ["one": 1, "two": 2, "three": 3])
-        testForm(test, query: "a[one]=1&a[three]=3&a[two]=2")
+        self.testForm(test, query: "a[one]=1&a[three]=3&a[two]=2")
     }
 
     @available(iOS 10.0, tvOS 10.0, *)
@@ -135,10 +135,10 @@ class URLDecodedFormDecoderTests: XCTestCase {
             let d: Date
         }
         let test = Test(d: Date(timeIntervalSinceReferenceDate: 2_387_643))
-        testForm(test, query: "d=2387643.0")
-        testForm(test, query: "d=980694843000", decoder: .init(dateDecodingStrategy: .millisecondsSince1970))
-        testForm(test, query: "d=980694843", decoder: .init(dateDecodingStrategy: .secondsSince1970))
-        testForm(test, query: "d=2001-01-28T15%3A14%3A03Z", decoder: .init(dateDecodingStrategy: .iso8601))
+        self.testForm(test, query: "d=2387643.0")
+        self.testForm(test, query: "d=980694843000", decoder: .init(dateDecodingStrategy: .millisecondsSince1970))
+        self.testForm(test, query: "d=980694843", decoder: .init(dateDecodingStrategy: .secondsSince1970))
+        self.testForm(test, query: "d=2001-01-28T15%3A14%3A03Z", decoder: .init(dateDecodingStrategy: .iso8601))
 
         let dateFormatter = DateFormatter()
         dateFormatter.locale = Locale(identifier: "en_US_POSIX")

diff --git a/Tests/HummingbirdFoundationTests/URLEncodedForm/URLEncodedNodeTests.swift b/Tests/HummingbirdFoundationTests/URLEncodedForm/URLEncodedNodeTests.swift
@@ -64,31 +64,31 @@ class URLEncodedFormNodeTests: XCTestCase {
     func testSimple() {
         let values = "one=1&two=2&three=3"
         let encoded: URLEncodedFormNode = ["one": "1", "two": "2", "three": "3"]
-        testDecodeEncode(values, encoded: encoded)
+        self.testDecodeEncode(values, encoded: encoded)
     }
 
     func testArray() {
         let values = "array[]=1&array[]=2&array[]=3&array[]=6"
         let encoded: URLEncodedFormNode = ["array": ["1", "2", "3", "6"]]
-        testDecodeEncode(values, encoded: encoded)
+        self.testDecodeEncode(values, encoded: encoded)
     }
 
     func testMap() {
         let values = "map[one]=1&map[two]=2&map[three]=3&map[six]=6"
         let encoded: URLEncodedFormNode = ["map": ["one": "1", "two": "2", "three": "3", "six": "6"]]
-        testDecodeEncode(values, encoded: encoded)
+        self.testDecodeEncode(values, encoded: encoded)
     }
 
     func testMapArray() {
         let values = "map[numbers][]=1&map[numbers][]=2"
         let encoded: URLEncodedFormNode = ["map": ["numbers": ["1", "2"]]]
-        testDecodeEncode(values, encoded: encoded)
+        self.testDecodeEncode(values, encoded: encoded)
     }
 
     func testMapMap() {
         let values = "map[numbers][one]=1&map[numbers][two]=2"
         let encoded: URLEncodedFormNode = ["map": ["numbers": ["one": "1", "two": "2"]]]
-        testDecodeEncode(values, encoded: encoded)
+        self.testDecodeEncode(values, encoded: encoded)
     }
 
     func testPlusSign() {

diff --git a/Tests/HummingbirdFoundationTests/URLEncodedForm/URLEncoderTests.swift b/Tests/HummingbirdFoundationTests/URLEncodedForm/URLEncoderTests.swift
@@ -46,7 +46,7 @@ class URLEncodedFormEncoderTests: XCTestCase {
             }
         }
         let test = Test(a: "Testing", b: 42)
-        testForm(test, query: "A=Testing&B=42")
+        self.testForm(test, query: "A=Testing&B=42")
     }
 
     func testNumbers() {
@@ -66,7 +66,7 @@ class URLEncodedFormEncoderTests: XCTestCase {
             let d: Double
         }
         let test = Test(b: true, i: 34, i8: 23, i16: 9, i32: -6872, i64: 23, u: 0, u8: 255, u16: 7673, u32: 88222, u64: 234, f: -1.1, d: 8)
-        testForm(test, query: "b=true&i=34&i8=23&i16=9&i32=-6872&i64=23&u=0&u8=255&u16=7673&u32=88222&u64=234&f=-1.1&d=8.0")
+        self.testForm(test, query: "b=true&i=34&i8=23&i16=9&i32=-6872&i64=23&u=0&u8=255&u16=7673&u32=88222&u64=234&f=-1.1&d=8.0")
     }
 
     func testNumberArrays() {
@@ -86,15 +86,15 @@ class URLEncodedFormEncoderTests: XCTestCase {
             let d: [Double]
         }
         let test = Test(b: [true], i: [34], i8: [23], i16: [9], i32: [-6872], i64: [23], u: [0], u8: [255], u16: [7673], u32: [88222], u64: [234], f: [-1.1], d: [8])
-        testForm(test, query: "b[]=true&i[]=34&i8[]=23&i16[]=9&i32[]=-6872&i64[]=23&u[]=0&u8[]=255&u16[]=7673&u32[]=88222&u64[]=234&f[]=-1.1&d[]=8.0")
+        self.testForm(test, query: "b[]=true&i[]=34&i8[]=23&i16[]=9&i32[]=-6872&i64[]=23&u[]=0&u8[]=255&u16[]=7673&u32[]=88222&u64[]=234&f[]=-1.1&d[]=8.0")
     }
 
     func testStringSpecialCharactersEncode() {
         struct Test: Codable {
             let a: String
         }
         let test = Test(a: "adam+!@£$%^&*()_=")
-        testForm(test, query: "a=adam%2B%21%40%C2%A3%24%25%5E%26%2A%28%29_%3D")
+        self.testForm(test, query: "a=adam%2B%21%40%C2%A3%24%25%5E%26%2A%28%29_%3D")
     }
 
     func testContainingStructureEncode() {
@@ -106,7 +106,7 @@ class URLEncodedFormEncoderTests: XCTestCase {
             let t: Test
         }
         let test = Test2(t: Test(a: 42, b: "Life"))
-        testForm(test, query: "t[a]=42&t[b]=Life")
+        self.testForm(test, query: "t[a]=42&t[b]=Life")
     }
 
     func testEnumEncode() {
@@ -120,23 +120,23 @@ class URLEncodedFormEncoderTests: XCTestCase {
         }
         let test = Test(a: .second)
         // NB enum names don't change to rawValue (not sure how to fix)
-        testForm(test, query: "a=second")
+        self.testForm(test, query: "a=second")
     }
 
     func testArrayEncode() {
         struct Test: Codable {
             let a: [Int]
         }
         let test = Test(a: [9, 8, 7, 6])
-        testForm(test, query: "a[]=9&a[]=8&a[]=7&a[]=6")
+        self.testForm(test, query: "a[]=9&a[]=8&a[]=7&a[]=6")
     }
 
     func testDictionaryEncode() {
         struct Test: Codable {
             let a: [String: Int]
         }
         let test = Test(a: ["one": 1, "two": 2, "three": 3])
-        testForm(test, query: "a[one]=1&a[three]=3&a[two]=2")
+        self.testForm(test, query: "a[one]=1&a[three]=3&a[two]=2")
     }
 
     @available(iOS 10.0, tvOS 10.0, *)
@@ -145,10 +145,10 @@ class URLEncodedFormEncoderTests: XCTestCase {
             let d: Date
         }
         let test = Test(d: Date(timeIntervalSinceReferenceDate: 2_387_643))
-        testForm(test, query: "d=2387643.0")
-        testForm(test, query: "d=980694843000.0", encoder: .init(dateEncodingStrategy: .millisecondsSince1970))
-        testForm(test, query: "d=980694843.0", encoder: .init(dateEncodingStrategy: .secondsSince1970))
-        testForm(test, query: "d=2001-01-28T15%3A14%3A03Z", encoder: .init(dateEncodingStrategy: .iso8601))
+        self.testForm(test, query: "d=2387643.0")
+        self.testForm(test, query: "d=980694843000.0", encoder: .init(dateEncodingStrategy: .millisecondsSince1970))
+        self.testForm(test, query: "d=980694843.0", encoder: .init(dateEncodingStrategy: .secondsSince1970))
+        self.testForm(test, query: "d=2001-01-28T15%3A14%3A03Z", encoder: .init(dateEncodingStrategy: .iso8601))
 
         let dateFormatter = DateFormatter()
         dateFormatter.locale = Locale(identifier: "en_US_POSIX")

diff --git a/scripts/sanity.sh b/scripts/sanity.sh
@@ -13,7 +13,7 @@
 ##
 ##===----------------------------------------------------------------------===##
 
-SWIFT_FORMAT_VERSION=0.47.13
+SWIFT_FORMAT_VERSION=0.48.17
 
 set -eu
 here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"