Skip to content

Commit 3fd8672

Browse files
committed
Move .standardOutput and .standardError out of Execution and remove AtomicBox
1 parent abd34ba commit 3fd8672

17 files changed

+600
-938
lines changed

Sources/Subprocess/API.swift

+334-61
Large diffs are not rendered by default.

Sources/Subprocess/AsyncBufferSequence.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#endif
2121
public struct AsyncBufferSequence: AsyncSequence, Sendable {
2222
public typealias Failure = any Swift.Error
23-
public typealias Element = SequenceOutput.Buffer
23+
public typealias Element = Buffer
2424

2525
@_nonSendable
2626
public struct Iterator: AsyncIteratorProtocol {
27-
public typealias Element = SequenceOutput.Buffer
27+
public typealias Element = Buffer
2828

2929
private let diskIO: TrackedPlatformDiskIO
3030
private var buffer: [UInt8]
@@ -38,7 +38,7 @@ public struct AsyncBufferSequence: AsyncSequence, Sendable {
3838
self.finished = false
3939
}
4040

41-
public func next() async throws -> SequenceOutput.Buffer? {
41+
public func next() async throws -> Buffer? {
4242
let data = try await self.diskIO.readChunk(
4343
upToLength: readBufferSize
4444
)

Sources/Subprocess/Atomic.swift

-241
This file was deleted.

Sources/Subprocess/Buffer.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#if SubprocessSpan
1515
@available(SubprocessSpan, *)
1616
#endif
17-
extension SequenceOutput {
17+
extension AsyncBufferSequence {
1818
/// A immutable collection of bytes
1919
public struct Buffer: Sendable {
2020
#if os(Windows)
@@ -37,7 +37,7 @@ extension SequenceOutput {
3737
#if SubprocessSpan
3838
@available(SubprocessSpan, *)
3939
#endif
40-
extension SequenceOutput.Buffer {
40+
extension AsyncBufferSequence.Buffer {
4141
/// Number of bytes stored in the buffer
4242
public var count: Int {
4343
return self.data.count
@@ -53,7 +53,7 @@ extension SequenceOutput.Buffer {
5353
#if SubprocessSpan
5454
@available(SubprocessSpan, *)
5555
#endif
56-
extension SequenceOutput.Buffer {
56+
extension AsyncBufferSequence.Buffer {
5757
#if !SubprocessSpan
5858
/// Access the raw bytes stored in this buffer
5959
/// - Parameter body: A closure with an `UnsafeRawBufferPointer` parameter that
@@ -140,11 +140,11 @@ extension SequenceOutput.Buffer {
140140
#if SubprocessSpan
141141
@available(SubprocessSpan, *)
142142
#endif
143-
extension SequenceOutput.Buffer: Equatable, Hashable {
143+
extension AsyncBufferSequence.Buffer: Equatable, Hashable {
144144
#if os(Windows)
145145
// Compiler generated conformances
146146
#else
147-
public static func == (lhs: SequenceOutput.Buffer, rhs: SequenceOutput.Buffer) -> Bool {
147+
public static func == (lhs: AsyncBufferSequence.Buffer, rhs: AsyncBufferSequence.Buffer) -> Bool {
148148
return lhs.data.elementsEqual(rhs.data)
149149
}
150150

0 commit comments

Comments
 (0)