Replaces state.observer with observer.

This commit is contained in:
Krunoslav Zaher 2015-05-02 19:43:24 +02:00
parent 7dc799d6be
commit e841b40cae
6 changed files with 9 additions and 9 deletions

View File

@ -20,7 +20,7 @@ class DistinctUntilChanged_<ElementType, Key>: Sink<ElementType>, ObserverType {
}
func on(event: Event<Element>) {
let observer = super.state.observer
let observer = super.observer
switch event {
case .Next(let value):

View File

@ -40,7 +40,7 @@ class Multicast_<SourceType, IntermediateType, ResultType>: Sink<ResultType>, Ob
}
func on(event: Event<ResultType>) {
self.state.observer.on(event)
self.observer.on(event)
switch event {
case .Next: break
case .Error: fallthrough

View File

@ -53,7 +53,7 @@ class RefCount_<Element> : Sink<Element>, ObserverType {
}
func on(event: Event<Element>) {
let observer = state.observer
let observer = self.observer
switch event {
case .Next:

View File

@ -21,7 +21,7 @@ class Select_<ElementType, ResultType> : Sink<ResultType>, ObserverType {
}
func on(event: Event<ElementType>) {
let observer = super.state.observer
let observer = super.observer
switch event {
case .Next(let element):

View File

@ -59,9 +59,9 @@ class Switch_<ElementType> : Sink<ElementType>, ObserverType {
d.setDisposable(disposable)
case .Error(let error):
self.lock.performLocked {
return self.state.observer.on(.Error(error))
self.observer.on(.Error(error))
self.dispose()
}
self.dispose()
case .Completed:
self.lock.performLocked {
self.switchState.stopped = true
@ -69,7 +69,7 @@ class Switch_<ElementType> : Sink<ElementType>, ObserverType {
self.switchState.subscription.dispose()
if !self.switchState.hasLatest {
self.state.observer.on(.Completed)
self.observer.on(.Completed)
self.dispose()
}
}
@ -104,7 +104,7 @@ class SwitchIter<ElementType> : ObserverType {
return
}
let observer = self.parent.state.observer
let observer = self.parent.observer
switch event {
case .Next:

View File

@ -108,7 +108,7 @@ class TailRecursiveSink<ElementType> : Sink<ElementType>, ObserverType {
}
func done() {
state.observer.on(.Completed)
observer.on(.Completed)
self.dispose()
}