Skip to content

Commit 5c07ffa

Browse files
committed
Remove unnecessary requirements from Signal[Producer]Protocol.
1 parent f92da49 commit 5c07ffa

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

Sources/Flatten.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,8 +594,8 @@ extension Signal where Value: SignalProducerProtocol, Error == Value.Error {
594594

595595
return self.observe { event in
596596
switch event {
597-
case let .value(producer):
598-
producer.startWithSignal { innerSignal, innerDisposable in
597+
case let .value(p):
598+
p.producer.startWithSignal { innerSignal, innerDisposable in
599599
inFlight.modify { $0 += 1 }
600600
let handle = disposable.add(innerDisposable)
601601

@@ -715,8 +715,8 @@ extension Signal where Value: SignalProducerProtocol, Error == Value.Error {
715715

716716
return self.observe { event in
717717
switch event {
718-
case let .value(innerProducer):
719-
innerProducer.startWithSignal { innerSignal, innerDisposable in
718+
case let .value(p):
719+
p.producer.startWithSignal { innerSignal, innerDisposable in
720720
state.modify {
721721
// When we replace the disposable below, this prevents
722722
// the generated Interrupted event from doing any work.

Sources/Signal.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,10 +418,6 @@ public protocol SignalProtocol {
418418

419419
/// Extracts a signal from the receiver.
420420
var signal: Signal<Value, Error> { get }
421-
422-
/// Observes the Signal by sending any future events to the given observer.
423-
@discardableResult
424-
func observe(_ observer: Signal<Value, Error>.Observer) -> Disposable?
425421
}
426422

427423
extension Signal: SignalProtocol {

Sources/SignalProducer.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,6 @@ public protocol SignalProducerProtocol {
195195

196196
/// Extracts a signal producer from the receiver.
197197
var producer: SignalProducer<Value, Error> { get }
198-
199-
/// Initialize a signal
200-
init(_ startHandler: @escaping (Signal<Value, Error>.Observer, CompositeDisposable) -> Void)
201-
202-
/// Creates a Signal from the producer, passes it into the given closure,
203-
/// then starts sending events on the Signal when the closure has returned.
204-
func startWithSignal(_ setup: (_ signal: Signal<Value, Error>, _ interrupter: Disposable) -> Void)
205198
}
206199

207200
extension SignalProducer: SignalProducerProtocol {

0 commit comments

Comments
 (0)