Merge pull request #42 from marlimox/marlimox-issue-41

iCharlesHu · web-flow · commit d497846db144 · 2025-05-09T12:16:16.000-07:00
Allow both `standardOutput` and `standardError` to be streamed simultaneously with closure-based run.
diff --git a/Sources/Subprocess/Execution.swift b/Sources/Subprocess/Execution.swift
@@ -122,13 +122,13 @@ extension Execution where Error == SequenceOutput {
     /// via pipe under the hood and each pipe can only be consumed once.
     public var standardError: AsyncBufferSequence {
         let consumptionState = self.outputConsumptionState.bitwiseXor(
-            OutputConsumptionState.standardOutputConsumed
+            OutputConsumptionState.standardErrorConsumed
         )
 
         guard consumptionState.contains(.standardErrorConsumed),
             let readFd = self.errorPipe.readEnd
         else {
-            fatalError("The standard output has already been consumed")
+            fatalError("The standard error has already been consumed")
         }
         return AsyncBufferSequence(diskIO: readFd)
     }

Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,13 @@ extension Execution where Error == SequenceOutput {`
`122`	`122`	`/// via pipe under the hood and each pipe can only be consumed once.`
`123`	`123`	`public var standardError: AsyncBufferSequence {`
`124`	`124`	`let consumptionState = self.outputConsumptionState.bitwiseXor(`
`125`		`- OutputConsumptionState.standardOutputConsumed`
	`125`	`+ OutputConsumptionState.standardErrorConsumed`
`126`	`126`	`)`
`127`	`127`
`128`	`128`	`guard consumptionState.contains(.standardErrorConsumed),`
`129`	`129`	`let readFd = self.errorPipe.readEnd`
`130`	`130`	`else {`
`131`		`- fatalError("The standard output has already been consumed")`
	`131`	`+ fatalError("The standard error has already been consumed")`
`132`	`132`	`}`
`133`	`133`	`return AsyncBufferSequence(diskIO: readFd)`
`134`	`134`	`}`