Adopt ~Copyable in Subprocess

Sources/Subprocess/AsyncBufferSequence.swift

@@ -15,45 +15,57 @@
 @preconcurrency import SystemPackage
 #endif
 
+internal import Dispatch
+
 #if SubprocessSpan
 @available(SubprocessSpan, *)
 #endif
 public struct AsyncBufferSequence: AsyncSequence, Sendable {
     public typealias Failure = any Swift.Error
-    public typealias Element = SequenceOutput.Buffer
+    public typealias Element = Buffer
+
+    #if os(Windows)
+    internal typealias DiskIO = FileDescriptor
+    #else
+    internal typealias DiskIO = DispatchIO
+    #endif
 
     @_nonSendable
     public struct Iterator: AsyncIteratorProtocol {
-        public typealias Element = SequenceOutput.Buffer
+        public typealias Element = Buffer
 
-        private let diskIO: TrackedPlatformDiskIO
+        private let diskIO: DiskIO
         private var buffer: [UInt8]
         private var currentPosition: Int
         private var finished: Bool
 
-        internal init(diskIO: TrackedPlatformDiskIO) {
+        internal init(diskIO: DiskIO) {
             self.diskIO = diskIO
             self.buffer = []
             self.currentPosition = 0
             self.finished = false
         }
 
-        public func next() async throws -> SequenceOutput.Buffer? {
+        public func next() async throws -> Buffer? {
             let data = try await self.diskIO.readChunk(
                 upToLength: readBufferSize
             )
             if data == nil {
                 // We finished reading. Close the file descriptor now
-                try self.diskIO.safelyClose()
+                #if os(Windows)
+                try self.diskIO.close()
+                #else
+                self.diskIO.close()
+                #endif
                 return nil
             }
             return data
         }
     }
 
-    private let diskIO: TrackedPlatformDiskIO
+    private let diskIO: DiskIO
 
-    internal init(diskIO: TrackedPlatformDiskIO) {
+    internal init(diskIO: DiskIO) {
         self.diskIO = diskIO
     }
 

Sources/Subprocess/Buffer.swift

@@ -14,7 +14,7 @@
 #if SubprocessSpan
 @available(SubprocessSpan, *)
 #endif
-extension SequenceOutput {
+extension AsyncBufferSequence {
     /// A immutable collection of bytes
     public struct Buffer: Sendable {
         #if os(Windows)
@@ -37,7 +37,7 @@ extension SequenceOutput {
 #if SubprocessSpan
 @available(SubprocessSpan, *)
 #endif
-extension SequenceOutput.Buffer {
+extension AsyncBufferSequence.Buffer {
     /// Number of bytes stored in the buffer
     public var count: Int {
         return self.data.count
@@ -53,7 +53,7 @@ extension SequenceOutput.Buffer {
 #if SubprocessSpan
 @available(SubprocessSpan, *)
 #endif
-extension SequenceOutput.Buffer {
+extension AsyncBufferSequence.Buffer {
     #if !SubprocessSpan
     /// Access the raw bytes stored in this buffer
     /// - Parameter body: A closure with an `UnsafeRawBufferPointer` parameter that
@@ -140,11 +140,11 @@ extension SequenceOutput.Buffer {
 #if SubprocessSpan
 @available(SubprocessSpan, *)
 #endif
-extension SequenceOutput.Buffer: Equatable, Hashable {
+extension AsyncBufferSequence.Buffer: Equatable, Hashable {
     #if os(Windows)
     // Compiler generated conformances
     #else
-    public static func == (lhs: SequenceOutput.Buffer, rhs: SequenceOutput.Buffer) -> Bool {
+    public static func == (lhs: AsyncBufferSequence.Buffer, rhs: AsyncBufferSequence.Buffer) -> Bool {
         return lhs.data.elementsEqual(rhs.data)
     }