@@ -84,6 +84,8 @@ public func ==(lhs: Task, rhs: Task) -> Bool {
8484
8585/// A private class used to encapsulate a Unix pipe.
8686private final class Pipe {
87+ typealias ReadProducer = SignalProducer < NSData , TaskError >
88+
8789 /// The file descriptor for reading data.
8890 let readFD : Int32
8991
@@ -140,7 +142,7 @@ private final class Pipe {
140142 ///
141143 /// After starting the returned producer, `readFD` should not be used
142144 /// anywhere else, as it may close unexpectedly.
143- func transferReadsToProducer( ) -> SignalProducer < NSData , TaskError > {
145+ func transferReadsToProducer( ) -> ReadProducer {
144146 return SignalProducer { observer, disposable in
145147 dispatch_group_enter ( self . group)
146148 let channel = dispatch_io_create ( DISPATCH_IO_STREAM, self . readFD, self . queue) { error in
@@ -424,7 +426,7 @@ public func launchTask(task: Task, standardInput: SignalProducer<NSData, NoError
424426 case Failed( TaskError )
425427 case Interrupted
426428
427- var producer : SignalProducer < NSData , TaskError > {
429+ var producer : Pipe . ReadProducer {
428430 switch self {
429431 case let . Value( data) :
430432 return . init( value: data)
@@ -439,7 +441,7 @@ public func launchTask(task: Task, standardInput: SignalProducer<NSData, NoError
439441 }
440442
441443 return SignalProducer { observer, disposable in
442- func startAggregating( producer: SignalProducer < NSData , TaskError > ) -> AnyProperty < Aggregation ? > {
444+ func startAggregating( producer: Pipe . ReadProducer ) -> AnyProperty < Aggregation ? > {
443445 let aggregated = MutableProperty < Aggregation ? > ( nil )
444446
445447 producer. startWithSignal { signal, signalDisposable in
@@ -470,7 +472,7 @@ public func launchTask(task: Task, standardInput: SignalProducer<NSData, NoError
470472
471473 dispatch_group_enter ( group)
472474 rawTask. terminationHandler = { nstask in
473- func getProducer( property: AnyProperty < Aggregation ? > ) -> SignalProducer < NSData , TaskError > {
475+ func getProducer( property: AnyProperty < Aggregation ? > ) -> Pipe . ReadProducer {
474476 return property. producer
475477 . ignoreNil ( )
476478 . promoteErrors ( TaskError . self)
0 commit comments