Update swiftformat to 0.44.6 (#5263)

Author: paulb777

FirebaseStorageSwift/Tests/Integration/StorageIntegration.swift

@@ -116,7 +116,7 @@ class StorageIntegration: XCTestCase {
     let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")
     ref.putData(data) { result in
       self.assertResultSuccess(result)
-      ref.delete() { error in
+      ref.delete { error in
         XCTAssertNil(error, "Error should be nil")
       }
       expectation.fulfill()

Firestore/third_party/FirestoreEncoder/FirestoreDecoder.swift

@@ -92,7 +92,7 @@ class _FirestoreDecoder: Decoder {
                                                               debugDescription: "Cannot get keyed decoding container -- found null value instead."))
     }
 
-    guard let topContainer = self.storage.topContainer as? [String: Any] else {
+    guard let topContainer = storage.topContainer as? [String: Any] else {
       let context = DecodingError.Context(codingPath: codingPath, debugDescription: "Not a dictionary")
       throw DecodingError.typeMismatch([String: Any].self, context)
     }
@@ -108,7 +108,7 @@ class _FirestoreDecoder: Decoder {
                                                               debugDescription: "Cannot get unkeyed decoding container -- found null value instead."))
     }
 
-    guard let topContainer = self.storage.topContainer as? [Any] else {
+    guard let topContainer = storage.topContainer as? [Any] else {
       let context = DecodingError.Context(codingPath: codingPath, debugDescription: "Not an array")
       throw DecodingError.typeMismatch([Any].self, context)
     }
@@ -363,7 +363,7 @@ private struct _FirestoreKeyedDecodingContainer<K: CodingKey>: KeyedDecodingCont
   }
 
   private func require(key: Key) throws -> Any {
-    if let entry = self.container[key.stringValue] {
+    if let entry = container[key.stringValue] {
       return entry
     }
 
@@ -404,7 +404,7 @@ private struct _FirestoreKeyedDecodingContainer<K: CodingKey>: KeyedDecodingCont
     decoder.codingPath.append(key)
     defer { self.decoder.codingPath.removeLast() }
 
-    guard let value = self.container[key.stringValue] else {
+    guard let value = container[key.stringValue] else {
       throw DecodingError.valueNotFound(UnkeyedDecodingContainer.self,
                                         DecodingError.Context(codingPath: codingPath,
                                                               debugDescription: "Cannot get nested unkeyed container -- no value found for key \"\(key.stringValue)\""))
@@ -637,7 +637,7 @@ private struct _FirestoreUnkeyedDecodingContainer: UnkeyedDecodingContainer {
 
     try expectNotAtEnd()
 
-    let value = self.container[self.currentIndex]
+    let value = self.container[currentIndex]
     try requireNotNSNull(value)
 
     guard let dictionary = value as? [String: Any] else {
@@ -655,7 +655,7 @@ private struct _FirestoreUnkeyedDecodingContainer: UnkeyedDecodingContainer {
 
     try expectNotAtEnd()
 
-    let value = container[self.currentIndex]
+    let value = container[currentIndex]
     try requireNotNSNull(value)
 
     guard let array = value as? [Any] else {
@@ -672,14 +672,14 @@ private struct _FirestoreUnkeyedDecodingContainer: UnkeyedDecodingContainer {
 
     try expectNotAtEnd()
 
-    let value = container[self.currentIndex]
+    let value = container[currentIndex]
     currentIndex += 1
     return _FirestoreDecoder(referencing: value, at: decoder.codingPath)
   }
 
   private func expectNotAtEnd() throws {
     guard !isAtEnd else {
-      throw DecodingError.valueNotFound(Any?.self, DecodingError.Context(codingPath: decoder.codingPath + [_FirestoreKey(index: self.currentIndex)], debugDescription: "Unkeyed container is at end."))
+      throw DecodingError.valueNotFound(Any?.self, DecodingError.Context(codingPath: decoder.codingPath + [_FirestoreKey(index: currentIndex)], debugDescription: "Unkeyed container is at end."))
     }
   }
 
@@ -1040,15 +1040,15 @@ extension _FirestoreDecoder {
 
   func unbox<T: Decodable>(_ value: Any, as _: T.Type) throws -> T? {
     if T.self == Date.self || T.self == NSDate.self {
-      guard let date = try self.unbox(value, as: Date.self) else { return nil }
+      guard let date = try unbox(value, as: Date.self) else { return nil }
       return (date as! T)
     }
     if T.self == Data.self || T.self == NSData.self {
-      guard let data = try self.unbox(value, as: Data.self) else { return nil }
+      guard let data = try unbox(value, as: Data.self) else { return nil }
       return (data as! T)
     }
     if T.self == URL.self || T.self == NSURL.self {
-      guard let urlString = try self.unbox(value, as: String.self) else {
+      guard let urlString = try unbox(value, as: String.self) else {
         return nil
       }
       guard let url = URL(string: urlString) else {
@@ -1058,7 +1058,7 @@ extension _FirestoreDecoder {
       return (url as! T)
     }
     if T.self == Decimal.self || T.self == NSDecimalNumber.self {
-      guard let decimal = try self.unbox(value, as: Decimal.self) else { return nil }
+      guard let decimal = try unbox(value, as: Decimal.self) else { return nil }
       return (decimal as! T)
     }
     if let v = value as? T {

Firestore/third_party/FirestoreEncoder/FirestoreEncoder.swift

@@ -98,7 +98,7 @@ private class _FirestoreEncoder: Encoder {
       // We haven't yet pushed a container at this level; do so here.
       topContainer = storage.pushKeyedContainer()
     } else {
-      guard let container = self.storage.containers.last as? NSMutableDictionary else {
+      guard let container = storage.containers.last as? NSMutableDictionary else {
         preconditionFailure("Attempt to push new keyed encoding container when already previously encoded at this path.")
       }
 
@@ -116,7 +116,7 @@ private class _FirestoreEncoder: Encoder {
       // We haven't yet pushed a container at this level; do so here.
       topContainer = storage.pushUnkeyedContainer()
     } else {
-      guard let container = self.storage.containers.last as? NSMutableArray else {
+      guard let container = storage.containers.last as? NSMutableArray else {
         preconditionFailure("Attempt to push new unkeyed encoding container when already previously encoded at this path.")
       }
 

README.md

@@ -124,7 +124,7 @@ These commands will get the right versions:
 
 ```
 brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb
-brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/7963c3d/Formula/swiftformat.rb
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/c13eda8/Formula/swiftformat.rb
 ```
 
 Note: if you already have a newer version of these installed you may need to

scripts/setup_check.sh

@@ -22,7 +22,7 @@ export HOMEBREW_NO_ANALYTICS=1
 export HOMEBREW_NO_AUTO_UPDATE=1
 
 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/7963c3d/Formula/swiftformat.rb
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c13eda8/Formula/swiftformat.rb
 
 pip install flake8