Merge pull request #7 from SwiftRex/buildTimeFixes

Reduce build time by a few milliseconds

Author: melle

Package.swift

@@ -20,6 +20,9 @@ let package = Package(
             dependencies: [
                 .product(name: "CombineRex", package: "SwiftRex")
             ]
+//            Enable this for build performance warnings. Works only when building the Package, works not when building the workspace! Obey the comma.
+//            , swiftSettings: [SwiftSetting.unsafeFlags(["-Xfrontend", "-warn-long-expression-type-checking=10", "-Xfrontend", "-warn-long-function-bodies=10"])]
+
         ),
         .testTarget(name: "LoggerMiddlewareTests", dependencies: ["LoggerMiddleware"])
     ]

Sources/LoggerMiddleware/Diff.swift

@@ -20,13 +20,17 @@ public struct Difference<A> {
 extension Difference where A == String {
     public static func diff(old: String, new: String, linesOfContext: Int, prefixLines: String = "") -> String? {
         guard old != new else { return nil }
-        let oldSplit = old.split(separator: "\n", omittingEmptySubsequences: false).map(String.init)
-        let newSplit = new.split(separator: "\n", omittingEmptySubsequences: false).map(String.init)
+        let oldSplit: [String] = old.split(separator: "\n", omittingEmptySubsequences: false).map(String.init)
+        let newSplit: [String] = new.split(separator: "\n", omittingEmptySubsequences: false).map(String.init)
 
         return chunk(
             diff: Difference.diff(oldSplit, newSplit),
             context: linesOfContext
-        ).lazy.flatMap { [$0.patchMark] + $0.lines }.map { "\(prefixLines)\($0)" }.joined(separator: "\n")
+        )
+        .lazy
+        .flatMap { (hunk: Hunk) -> [String] in [hunk.patchMark] + hunk.lines }
+        .map { (line: String) -> String in "\(prefixLines)\(line)" }
+        .joined(separator: "\n")
     }
 }
 

Sources/LoggerMiddleware/LoggerMiddleware.swift

@@ -121,7 +121,7 @@ extension LoggerMiddleware {
     }
 
     private static func fileLog(state: String, to fileURL: URL) {
-        try? state.write(toFile: fileURL.absoluteString, atomically: false, encoding: .utf8)
+        try? state.write(toFile: fileURL.absoluteString, atomically: false, encoding: String.Encoding.utf8)
     }
 }
 
@@ -189,8 +189,8 @@ extension LoggerMiddleware {
 
         // special handling for sets as well: order the contents, compare as strings
         if let left = leftHandSide as? Set<AnyHashable>, let right = rightHandSide as? Set<AnyHashable> {
-            let leftSorted = left.map { "\($0)" }.sorted { a, b in a < b }
-            let rightSorted = right.map { "\($0)" }.sorted { a, b in a < b }
+            let leftSorted: [String] = left.map { (lft: AnyHashable) in "\(lft)" }.sorted { a, b in a < b }
+            let rightSorted: [String] = right.map { (rgt: AnyHashable) in "\(rgt)" }.sorted { a, b in a < b }
 
             let leftPrintable = leftSorted.joined(separator: ", ")
             let rightPrintable = rightSorted.joined(separator: ", ")
@@ -215,7 +215,7 @@ extension LoggerMiddleware {
         }
 
         // there are children -> diff the object graph recursively
-        let strings: [String] = leftMirror.children.map({ leftChild  in
+        let strings: [String] = leftMirror.children.map({ (leftChild: Mirror.Child) -> String? in
             let toDotOrNotToDot = (level > 0) ? "." : " "
             return Self.diff(prefix: "\(prefix)\(toDotOrNotToDot)\(name)",
                              name: leftChild.label ?? "#", // label might be missing for items in collections, # represents a collection element
@@ -227,7 +227,7 @@ extension LoggerMiddleware {
         .compactMap { $0 }
         .filter { (diffLine: String) -> Bool in
             // filter diffLine if it contains a filterString
-            false == (filters ?? []).contains(where: { filterString in
+            false == (filters ?? []).contains(where: { (filterString: String) -> Bool in
                 diffLine.contains(filterString)
             })
         }