@@ -230,15 +230,9 @@ private final class Pipe {
230230 }
231231}
232232
233- /// Sent when reading from a pipe.
234- private enum ReadData {
235- /// A chunk of data, sent as soon as it is received.
236- case Chunk( NSData )
237- }
238-
239233/// Takes ownership of the read handle from the given pipe, then sends
240- /// `ReadData ` values for all data read.
241- private func aggregateDataReadFromPipe( pipe: Pipe ) -> SignalProducer < ReadData , TaskError > {
234+ /// `NSData ` values for all data read.
235+ private func aggregateDataReadFromPipe( pipe: Pipe ) -> SignalProducer < NSData , TaskError > {
242236 let readProducer = pipe. transferReadsToProducer ( )
243237
244238 return SignalProducer { observer, disposable in
@@ -248,7 +242,7 @@ private func aggregateDataReadFromPipe(pipe: Pipe) -> SignalProducer<ReadData, T
248242 disposable. addDisposable ( signalDisposable)
249243
250244 signal. observe ( Observer ( next: { data in
251- observer. sendNext ( . Chunk ( data) )
245+ observer. sendNext ( data)
252246 buffer. appendData ( data)
253247 } , failed: observer. sendFailed
254248 , completed: {
@@ -459,12 +453,9 @@ public func launchTask(taskDescription: Task, standardInput: SignalProducer<NSDa
459453 disposable += signalDisposable
460454
461455 let aggregate = NSMutableData ( )
462- signal. observe ( Observer ( next: { readData in
463- switch readData {
464- case let . Chunk( data) :
465- observer. sendNext ( . StandardOutput( data) )
466- aggregate. appendData ( data)
467- }
456+ signal. observe ( Observer ( next: { data in
457+ observer. sendNext ( . StandardOutput( data) )
458+ aggregate. appendData ( data)
468459 } , failed: { error in
469460 observer. sendFailed ( error)
470461 stdoutAggregatedObserver. sendFailed ( error)
@@ -479,12 +470,9 @@ public func launchTask(taskDescription: Task, standardInput: SignalProducer<NSDa
479470 disposable += signalDisposable
480471
481472 let aggregate = NSMutableData ( )
482- signal. observe ( Observer ( next: { readData in
483- switch readData {
484- case let . Chunk( data) :
485- observer. sendNext ( . StandardError( data) )
486- aggregate. appendData ( data)
487- }
473+ signal. observe ( Observer ( next: { data in
474+ observer. sendNext ( . StandardError( data) )
475+ aggregate. appendData ( data)
488476 } , failed: { error in
489477 observer. sendFailed ( error)
490478 stderrAggregatedObserver. sendFailed ( error)
0 commit comments