@@ -230,26 +230,6 @@ private final class Pipe {
230230 }
231231}
232232
233- /// Takes ownership of the read handle from the given pipe, then sends
234- /// `NSData` values for all data read.
235- private func aggregateDataReadFromPipe( pipe: Pipe ) -> SignalProducer < NSData , TaskError > {
236- let readProducer = pipe. transferReadsToProducer ( )
237-
238- return SignalProducer { observer, disposable in
239- readProducer. startWithSignal { signal, signalDisposable in
240- disposable. addDisposable ( signalDisposable)
241-
242- signal. observe ( Observer ( next: { data in
243- observer. sendNext ( data)
244- } , failed: observer. sendFailed
245- , completed: {
246- observer. sendCompleted ( )
247- } , interrupted: observer. sendInterrupted
248- ) )
249- }
250- }
251- }
252-
253233public protocol TaskEventType {
254234 /// The type of value embedded in a `Success` event.
255235 typealias T
@@ -439,8 +419,8 @@ public func launchTask(taskDescription: Task, standardInput: SignalProducer<NSDa
439419
440420 SignalProducer ( result: Pipe . create ( queue, group) &&& Pipe . create ( queue, group) )
441421 . flatMap ( . Merge) { stdoutPipe, stderrPipe -> SignalProducer < TaskEvent < NSData > , TaskError > in
442- let stdoutProducer = aggregateDataReadFromPipe ( stdoutPipe)
443- let stderrProducer = aggregateDataReadFromPipe ( stderrPipe)
422+ let stdoutProducer = stdoutPipe. transferReadsToProducer ( )
423+ let stderrProducer = stderrPipe. transferReadsToProducer ( )
444424
445425 return SignalProducer { observer, disposable in
446426 let ( stdoutAggregated, stdoutAggregatedObserver) = SignalProducer < NSData , TaskError > . buffer ( 1 )
0 commit comments