Merge branch 'main' into deployment-target-macOS-15

F1248 · Aug 23, 2024 · 9ebf729 · 9ebf729
2 parents 8968bc7 + 338e316
commit 9ebf729
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/Genius/Extensions/Foundation/Pipe.swift b/Genius/Extensions/Foundation/Pipe.swift
@@ -10,7 +10,6 @@ import Foundation
 extension Pipe {
 
     func read() -> String? {
-        guard let data = try? fileHandleForReading.readToEnd() else { return nil }
-        return String(data)
+        String(try? fileHandleForReading.readToEnd())
     }
 }
diff --git a/Genius/Extensions/Foundation/URL.swift b/Genius/Extensions/Foundation/URL.swift
@@ -10,8 +10,7 @@ import Foundation
 extension URL {
 
     init?(_ path: String?) {
-        guard let path else { return nil }
-        guard FileManager.default.fileExists(atPath: path) else { return nil }
+        guard let path, FileManager.default.fileExists(atPath: path) else { return nil }
         self.init(fileURLWithPath: path)
     }
 }
diff --git a/Genius/Extensions/Swift/String.swift b/Genius/Extensions/Swift/String.swift
@@ -24,7 +24,8 @@ extension String {
         ).localized
     }
 
-    init(_ data: Data) {
+    init?(_ data: Data?) {
+        guard let data else { return nil }
         self.init(decoding: data, as: UTF8.self)
     }
 

diff --git a/Genius/Types/VersionNumber.swift b/Genius/Types/VersionNumber.swift
@@ -16,8 +16,7 @@ struct VersionNumber {
     init?(_ versionNumber: Any?) {
         guard let versionNumber = versionNumber as? Substring else { return nil }
         let components = versionNumber.split(separator: ".")
-        guard !components.isEmpty else { return nil }
-        guard let versions = [Int](components) else { return nil }
+        guard !components.isEmpty, let versions = [Int](components) else { return nil }
         self.versions = versions
     }
 }