Remove unnecessary availability check around AsyncBufferSequence and closure based run()

Author: iCharlesHu

Sources/Subprocess/API.swift

@@ -158,9 +158,6 @@ public func run<
 ///   - body: The custom execution body to manually control the running process
 /// - Returns a ExecutableResult type containing the return value
 ///     of the closure.
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public func run<Result, Input: InputProtocol, Error: OutputProtocol>(
     _ executable: Executable,
     arguments: Arguments = [],
@@ -208,9 +205,6 @@ public func run<Result, Input: InputProtocol, Error: OutputProtocol>(
     }
 }
 
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public func run<Result, Input: InputProtocol, Output: OutputProtocol>(
     _ executable: Executable,
     arguments: Arguments = [],
@@ -258,9 +252,6 @@ public func run<Result, Input: InputProtocol, Output: OutputProtocol>(
     }
 }
 
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public func run<Result, Error: OutputProtocol>(
     _ executable: Executable,
     arguments: Arguments = [],
@@ -291,9 +282,6 @@ public func run<Result, Error: OutputProtocol>(
     }
 }
 
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public func run<Result, Output: OutputProtocol>(
     _ executable: Executable,
     arguments: Arguments = [],
@@ -340,9 +328,6 @@ public func run<Result, Output: OutputProtocol>(
 ///   - body: The custom execution body to manually control the running process
 /// - Returns a ExecutableResult type containing the return value
 ///     of the closure.
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public func run<Result>(
     _ executable: Executable,
     arguments: Arguments = [],
@@ -486,9 +471,6 @@ public func run<
 ///       the running process and write to its standard input.
 /// - Returns a ExecutableResult type containing the return value
 ///     of the closure.
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public func run<Result>(
     _ configuration: Configuration,
     isolation: isolated (any Actor)? = #isolation,
@@ -528,9 +510,6 @@ public func run<Result>(
 ///   - output: A file descriptor to bind to the subprocess' standard output.
 ///   - error: A file descriptor to bind to the subprocess' standard error.
 /// - Returns: the process identifier for the subprocess.
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public func runDetached(
     _ executable: Executable,
     arguments: Arguments = [],
@@ -564,9 +543,6 @@ public func runDetached(
 ///   - output: A file descriptor to bind to the subprocess' standard output.
 ///   - error: A file descriptor to bind to the subprocess' standard error.
 /// - Returns: the process identifier for the subprocess.
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public func runDetached(
     _ configuration: Configuration,
     input: FileDescriptor? = nil,

Sources/Subprocess/AsyncBufferSequence.swift

@@ -19,9 +19,6 @@
 internal import Dispatch
 #endif
 
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 public struct AsyncBufferSequence: AsyncSequence, Sendable {
     public typealias Failure = any Swift.Error
     public typealias Element = Buffer
@@ -93,9 +90,6 @@ public struct AsyncBufferSequence: AsyncSequence, Sendable {
 }
 
 // MARK: - LineSequence
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 extension AsyncBufferSequence {
     public struct LineSequence<Encoding: _UnicodeEncoding>: AsyncSequence, Sendable {
         public typealias Element = String
@@ -308,9 +302,6 @@ extension AsyncBufferSequence {
     }
 }
 
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 extension AsyncBufferSequence.LineSequence {
     public enum BufferingPolicy: Sendable {
         /// Continue to add to the buffer, without imposing a limit

Sources/Subprocess/Buffer.swift

@@ -13,9 +13,7 @@
 @preconcurrency internal import Dispatch
 #endif
 
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
+
 extension AsyncBufferSequence {
     /// A immutable collection of bytes
     public struct Buffer: Sendable {
@@ -52,9 +50,6 @@ extension AsyncBufferSequence {
 }
 
 // MARK: - Properties
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 extension AsyncBufferSequence.Buffer {
     /// Number of bytes stored in the buffer
     public var count: Int {
@@ -68,9 +63,6 @@ extension AsyncBufferSequence.Buffer {
 }
 
 // MARK: - Accessors
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 extension AsyncBufferSequence.Buffer {
     /// Access the raw bytes stored in this buffer
     /// - Parameter body: A closure with an `UnsafeRawBufferPointer` parameter that
@@ -87,6 +79,9 @@ extension AsyncBufferSequence.Buffer {
 
     #if SubprocessSpan
     // Access the storge backing this Buffer
+    #if SubprocessSpan
+    @available(SubprocessSpan, *)
+    #endif
     public var bytes: RawSpan {
         @lifetime(borrow self)
         borrowing get {
@@ -99,9 +94,6 @@ extension AsyncBufferSequence.Buffer {
 }
 
 // MARK: - Hashable, Equatable
-#if SubprocessSpan
-@available(SubprocessSpan, *)
-#endif
 extension AsyncBufferSequence.Buffer: Equatable, Hashable {
     #if os(Windows)
     // Compiler generated conformances

Sources/Subprocess/IO/Output.swift

@@ -166,12 +166,11 @@ public struct BytesOutput: OutputProtocol {
             fatalError("Trying to capture output without file descriptor")
         }
         #if os(Windows)
-        let result = try await diskIO.fileDescriptor.read(upToLength: self.maxSize)
+        return try await diskIO.fileDescriptor.read(upToLength: self.maxSize) ?? []
         #else
         let result = try await diskIO.dispatchIO.read(upToLength: self.maxSize)
-        #endif
-
         return result?.array() ?? []
+        #endif
     }
 
     #if SubprocessSpan
@@ -315,11 +314,11 @@ extension OutputProtocol {
 
         #if os(Windows)
         let result = try await diskIO.fileDescriptor.read(upToLength: self.maxSize)
+        return try self.output(from: result ?? [])
         #else
         let result = try await diskIO.dispatchIO.read(upToLength: self.maxSize)
-        #endif
-
         return try self.output(from: result ?? .empty)
+        #endif
     }
 }
 

Tests/SubprocessTests/SubprocessTests+Unix.swift

@@ -420,9 +420,6 @@ extension SubprocessUnixTests {
     }
 
     @Test func testInputSequenceCustomExecutionBody() async throws {
-        guard #available(SubprocessSpan , *) else {
-            return
-        }
         let expected: Data = try Data(
             contentsOf: URL(filePath: theMysteriousIsland.string)
         )
@@ -443,9 +440,6 @@ extension SubprocessUnixTests {
     }
 
     @Test func testInputAsyncSequenceCustomExecutionBody() async throws {
-        guard #available(SubprocessSpan , *) else {
-            return
-        }
         // Maeks ure we can read long text as AsyncSequence
         let fd: FileDescriptor = try .open(theMysteriousIsland, .readOnly)
         let expected: Data = try Data(
@@ -606,9 +600,6 @@ extension SubprocessUnixTests {
     }
 
     @Test func testRedirectedOutputWithUnsafeBytes() async throws {
-        guard #available(SubprocessSpan , *) else {
-            return
-        }
         // Make ure we can read long text redirected to AsyncSequence
         let expected: Data = try Data(
             contentsOf: URL(filePath: theMysteriousIsland.string)
@@ -629,20 +620,16 @@ extension SubprocessUnixTests {
         #expect(catResult.value == expected)
     }
 
+    #if SubprocessSpan
     @Test func testRedirectedOutputBytes() async throws {
-        guard #available(SubprocessSpan , *) else {
-            return
-        }
-
         // Make ure we can read long text redirected to AsyncSequence
         let expected: Data = try Data(
             contentsOf: URL(filePath: theMysteriousIsland.string)
         )
         let catResult = try await Subprocess.run(
             .path("/bin/cat"),
-            arguments: [theMysteriousIsland.string],
-            error: .discarded
-        ) { execution, standardOutput in
+            arguments: [theMysteriousIsland.string]
+        ) { (execution: Execution, standardOutput: AsyncBufferSequence) -> Data in
             var buffer: Data = Data()
             for try await chunk in standardOutput {
                 buffer += Data(bytes: chunk.bytes)
@@ -652,6 +639,7 @@ extension SubprocessUnixTests {
         #expect(catResult.terminationStatus.isSuccess)
         #expect(catResult.value == expected)
     }
+    #endif
 
     @Test func testBufferOutput() async throws {
         guard #available(SubprocessSpan , *) else {
@@ -688,6 +676,8 @@ extension SubprocessUnixTests {
     }
 }
 
+#if SubprocessSpan
+@available(SubprocessSpan, *)
 extension Data {
     init(bytes: borrowing RawSpan) {
         let data = bytes.withUnsafeBytes {
@@ -696,6 +686,7 @@ extension Data {
         self = data
     }
 }
+#endif
 
 // MARK: - PlatformOption Tests
 extension SubprocessUnixTests {
@@ -968,10 +959,6 @@ extension SubprocessUnixTests {
     }
 
     @Test func testLineSequence() async throws {
-        guard #available(SubprocessSpan , *) else {
-            return
-        }
-
         typealias TestCase = (value: String, count: Int, newLine: String)
         enum TestCaseSize: CaseIterable {
             case large      // (1.0 ~ 2.0) * buffer size