From 2e556c209e667cf708d7c9fdf4e00fc4380e468f Mon Sep 17 00:00:00 2001
From: yury <yury.korolev@gmail.com>
Date: Tue, 13 Oct 2015 12:29:49 +0300
Subject: [PATCH] Make private state of Sink private

---
 RxSwift/Observables/Implementations/Sink.swift     | 14 +++++++-------
 .../Observables/Implementations/SkipUntil.swift    |  6 +++---
 .../Observables/Implementations/SkipWhile.swift    | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/RxSwift/Observables/Implementations/Sink.swift b/RxSwift/Observables/Implementations/Sink.swift
index 48ec651b..c7b16261 100644
--- a/RxSwift/Observables/Implementations/Sink.swift
+++ b/RxSwift/Observables/Implementations/Sink.swift
@@ -9,22 +9,22 @@
 import Foundation
 
 class Sink<O : ObserverType> : Disposable {
-    private var lock = SpinLock()
+    private var _lock = SpinLock()
     
     // state
-    var _observer: O?
-    var _cancel: Disposable
-    var _disposed: Bool = false
+    private var _observer: O?
+    private var _cancel: Disposable
+    private var _disposed: Bool = false
     
     var observer: O? {
         get {
-            return lock.calculateLocked { _observer }
+            return _lock.calculateLocked { _observer }
         }
     }
     
     var cancel: Disposable {
         get {
-            return lock.calculateLocked { _cancel }
+            return _lock.calculateLocked { _cancel }
         }
     }
     
@@ -37,7 +37,7 @@ class Sink<O : ObserverType> : Disposable {
     }
     
     func dispose() {
-        let cancel: Disposable? = lock.calculateLocked {
+        let cancel: Disposable? = _lock.calculateLocked {
             if _disposed {
                 return nil
             }
diff --git a/RxSwift/Observables/Implementations/SkipUntil.swift b/RxSwift/Observables/Implementations/SkipUntil.swift
index 0a111999..6ce123ce 100644
--- a/RxSwift/Observables/Implementations/SkipUntil.swift
+++ b/RxSwift/Observables/Implementations/SkipUntil.swift
@@ -41,7 +41,7 @@ class SkipUntilSinkOther<ElementType, Other, O: ObserverType where O.E == Elemen
             }
         case .Error(let e):
             _parent._lock.performLocked {
-                _parent._observer?.onError(e)
+                _parent.observer?.onError(e)
                 _parent.dispose()
             }
         case .Completed:
@@ -87,14 +87,14 @@ class SkipUntilSink<ElementType, Other, O: ObserverType where O.E == ElementType
             switch event {
             case .Next:
                 if _forwardElements {
-                    _observer?.on(event)
+                    observer?.on(event)
                 }
             case .Error:
                 observer?.on(event)
                 dispose()
             case .Completed:
                 if _forwardElements {
-                    _observer?.on(event)
+                    observer?.on(event)
                 }
                 _singleAssignmentDisposable.dispose()
             }
diff --git a/RxSwift/Observables/Implementations/SkipWhile.swift b/RxSwift/Observables/Implementations/SkipWhile.swift
index eb10c043..9c048ffa 100644
--- a/RxSwift/Observables/Implementations/SkipWhile.swift
+++ b/RxSwift/Observables/Implementations/SkipWhile.swift
@@ -26,17 +26,17 @@ class SkipWhileSink<ElementType, O: ObserverType where O.E == ElementType> : Sin
                 do {
                     _running = try !_parent._predicate(value)
                 } catch let e {
-                    _observer?.onError(e)
+                    observer?.onError(e)
                     dispose()
                     return
                 }
             }
 
             if _running {
-                _observer?.onNext(value)
+                observer?.onNext(value)
             }
         case .Error, .Completed:
-            _observer?.on(event)
+            observer?.on(event)
             dispose()
         }
     }
@@ -64,17 +64,17 @@ class SkipWhileSinkWithIndex<ElementType, O: ObserverType where O.E == ElementTy
                     _running = try !_parent._predicateWithIndex(value, _index)
                     _index += 1
                 } catch let e {
-                    _observer?.onError(e)
+                    observer?.onError(e)
                     dispose()
                     return
                 }
             }
 
             if _running {
-                _observer?.onNext(value)
+                observer?.onNext(value)
             }
         case .Error, .Completed:
-            _observer?.on(event)
+            observer?.on(event)
             dispose()
         }
     }