SwiftPM 6.4 support - refactor error results

Author: johnfairh

Source/SourceKittenFramework/Exec.swift

@@ -24,6 +24,14 @@ enum Exec {
             let trimmed = encoded.trimmingCharacters(in: .whitespacesAndNewlines)
             return trimmed.isEmpty ? nil : trimmed
         }
+
+        /// Save `data` to a new temporary file and return its path
+        /// - parameter prefix: Prefix for the name of the temporary file
+        func save(prefix: String) -> String {
+            let file = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("\(prefix)-\(UUID().uuidString).log")
+            _ = try? data.write(to: file)
+            return file.path
+        }
     }
 
     /**

Source/SourceKittenFramework/Module.swift

@@ -84,9 +84,8 @@ public struct Module {
         if results.terminationStatus != 0 {
             fputs("Could not successfully run `xcodebuild`.\n", stderr)
             fputs("Please check the build arguments.\n", stderr)
-            let file = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("xcodebuild-\(NSUUID().uuidString).log")
-            _ = try? results.data.write(to: file)
-            fputs("Saved `xcodebuild` log file: \(file.path)\n", stderr)
+            let path = results.save(prefix: "xcodebuild")
+            fputs("Saved `xcodebuild` log file: \(path)\n", stderr)
             return nil
         }
         if let output = results.string,
@@ -108,9 +107,8 @@ public struct Module {
         guard let arguments = parseCompilerArguments(xcodebuildOutput: xcodeBuildOutput, language: .swift, moduleName: name) else {
             fputs("Could not parse compiler arguments from `xcodebuild` output.\n", stderr)
             fputs("Please confirm that `xcodebuild` is building a Swift module.\n", stderr)
-            let file = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("xcodebuild-\(NSUUID().uuidString).log")
-            _ = try? xcodeBuildOutput.data(using: .utf8)?.write(to: file)
-            fputs("Saved `xcodebuild` log file: \(file.path)\n", stderr)
+            let path = results.save(prefix: "xcodebuild")
+            fputs("Saved `xcodebuild` log file: \(path)\n", stderr)
             return nil
         }
         guard let moduleName = moduleName(fromArguments: arguments) else {

Source/SourceKittenFramework/SwiftPM.swift

@@ -64,9 +64,8 @@ enum SwiftPM {
     private static func runCheckedCommand(arguments: [String], inPath path: String, msgName: String) -> Exec.Results? {
         let results = Exec.run("/usr/bin/env", arguments, currentDirectory: path, stderr: .merge)
         guard results.terminationStatus == 0 else {
-            let file = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("swift-build-\(UUID().uuidString).log")
-            _ = try? results.data.write(to: file)
-            fputs("Build failed, saved `\(msgName)` log file: \(file.path)\n", stderr)
+            let path = results.save(prefix: "swift-build")
+            fputs("Build failed, saved `\(msgName)` log file: \(path)\n", stderr)
             return nil
         }
         return results