From f053c8a8a314d43e762568b6ca75cb286259d569 Mon Sep 17 00:00:00 2001 From: Ethan Kusters Date: Sat, 10 May 2025 18:40:15 -0700 Subject: [PATCH] Fix Swift 6.0.3 build There are a couple instances of trailing commas in the project that prevents it from compiling with Swift 6.0.3. This resolves the issues. --- .gitignore | 2 +- Sources/Subprocess/Configuration.swift | 2 +- Sources/_SubprocessCShims/process_shims.c | 2 +- Tests/SubprocessTests/SubprocessTests+Unix.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2ffb3d0..47bc2dc 100644 --- a/.gitignore +++ b/.gitignore @@ -46,8 +46,8 @@ playground.xcworkspace # # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata # hence it is not needed unless you have added a package configuration file to your project -# .swiftpm +.swiftpm/ .build/ # CocoaPods diff --git a/Sources/Subprocess/Configuration.swift b/Sources/Subprocess/Configuration.swift index 6586e10..214d750 100644 --- a/Sources/Subprocess/Configuration.swift +++ b/Sources/Subprocess/Configuration.swift @@ -872,7 +872,7 @@ internal struct CreatedPipe { internal init( readFileDescriptor: TrackedFileDescriptor?, - writeFileDescriptor: TrackedFileDescriptor?, + writeFileDescriptor: TrackedFileDescriptor? ) { self.readFileDescriptor = readFileDescriptor self.writeFileDescriptor = writeFileDescriptor diff --git a/Sources/_SubprocessCShims/process_shims.c b/Sources/_SubprocessCShims/process_shims.c index 8b0090d..4f0f46d 100644 --- a/Sources/_SubprocessCShims/process_shims.c +++ b/Sources/_SubprocessCShims/process_shims.c @@ -236,7 +236,7 @@ static int _subprocess_spawn_prefork( *pid = childPid; // Read from the pipe until pipe is closed // either due to exec succeeds or error is written - while (true) { + while (TRUE) { int childError = 0; ssize_t read_rc = read(pipefd[0], &childError, sizeof(childError)); if (read_rc == 0) { diff --git a/Tests/SubprocessTests/SubprocessTests+Unix.swift b/Tests/SubprocessTests/SubprocessTests+Unix.swift index 3326807..f6a82c9 100644 --- a/Tests/SubprocessTests/SubprocessTests+Unix.swift +++ b/Tests/SubprocessTests/SubprocessTests+Unix.swift @@ -938,7 +938,7 @@ extension SubprocessUnixTests { group.addTask { return try await Subprocess.run( .path("/bin/sh"), - arguments: ["-c", "trap 'echo no' TERM; while true; do sleep 1; done"], + arguments: ["-c", "trap 'echo no' TERM; while true; do sleep 1; done"] ).terminationStatus } group.addTask {