From e841b40caedb31cdcf9ab0d1df128b267ee8f838 Mon Sep 17 00:00:00 2001
From: Krunoslav Zaher <kzaher@Krunoslavs-MacBook-Pro.local>
Date: Sat, 2 May 2015 19:43:24 +0200
Subject: [PATCH] Replaces state.observer with observer.

---
 .../Implementations/DistinctUntilChanged.swift            | 2 +-
 .../RxSwift/Observables/Implementations/Multicast.swift   | 2 +-
 .../RxSwift/Observables/Implementations/RefCount.swift    | 2 +-
 RxSwift/RxSwift/Observables/Implementations/Select.swift  | 2 +-
 RxSwift/RxSwift/Observables/Implementations/Switch.swift  | 8 ++++----
 .../Observables/Implementations/TailRecursiveSink.swift   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/RxSwift/RxSwift/Observables/Implementations/DistinctUntilChanged.swift b/RxSwift/RxSwift/Observables/Implementations/DistinctUntilChanged.swift
index decdc031..ac8f791b 100644
--- a/RxSwift/RxSwift/Observables/Implementations/DistinctUntilChanged.swift
+++ b/RxSwift/RxSwift/Observables/Implementations/DistinctUntilChanged.swift
@@ -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):
diff --git a/RxSwift/RxSwift/Observables/Implementations/Multicast.swift b/RxSwift/RxSwift/Observables/Implementations/Multicast.swift
index df2ad311..74c4f40b 100644
--- a/RxSwift/RxSwift/Observables/Implementations/Multicast.swift
+++ b/RxSwift/RxSwift/Observables/Implementations/Multicast.swift
@@ -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
diff --git a/RxSwift/RxSwift/Observables/Implementations/RefCount.swift b/RxSwift/RxSwift/Observables/Implementations/RefCount.swift
index e175b9c6..9f99cadb 100644
--- a/RxSwift/RxSwift/Observables/Implementations/RefCount.swift
+++ b/RxSwift/RxSwift/Observables/Implementations/RefCount.swift
@@ -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:
diff --git a/RxSwift/RxSwift/Observables/Implementations/Select.swift b/RxSwift/RxSwift/Observables/Implementations/Select.swift
index 2c567cee..111ff72a 100644
--- a/RxSwift/RxSwift/Observables/Implementations/Select.swift
+++ b/RxSwift/RxSwift/Observables/Implementations/Select.swift
@@ -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):
diff --git a/RxSwift/RxSwift/Observables/Implementations/Switch.swift b/RxSwift/RxSwift/Observables/Implementations/Switch.swift
index ada58e8e..e96d00a9 100644
--- a/RxSwift/RxSwift/Observables/Implementations/Switch.swift
+++ b/RxSwift/RxSwift/Observables/Implementations/Switch.swift
@@ -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:
diff --git a/RxSwift/RxSwift/Observables/Implementations/TailRecursiveSink.swift b/RxSwift/RxSwift/Observables/Implementations/TailRecursiveSink.swift
index bbc81bce..6ab49809 100644
--- a/RxSwift/RxSwift/Observables/Implementations/TailRecursiveSink.swift
+++ b/RxSwift/RxSwift/Observables/Implementations/TailRecursiveSink.swift
@@ -108,7 +108,7 @@ class TailRecursiveSink<ElementType> : Sink<ElementType>, ObserverType {
     }
     
     func done() {
-        state.observer.on(.Completed)
+        observer.on(.Completed)
         self.dispose()
     }