From ceb14acadbfca69988b5c704cec4e45a5b91bbd2 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Mon, 2 Nov 2015 00:41:01 +0100 Subject: [PATCH] Makes `observer` in `Sink` private again. --- .../Observables/Implementations/DistinctUntilChanged.swift | 2 -- RxSwift/Observables/Implementations/FlatMap.swift | 2 -- RxSwift/Observables/Implementations/Map.swift | 2 -- RxSwift/Observables/Implementations/Sink.swift | 6 +++--- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/RxSwift/Observables/Implementations/DistinctUntilChanged.swift b/RxSwift/Observables/Implementations/DistinctUntilChanged.swift index 46b75b98..ae9f6192 100644 --- a/RxSwift/Observables/Implementations/DistinctUntilChanged.swift +++ b/RxSwift/Observables/Implementations/DistinctUntilChanged.swift @@ -20,8 +20,6 @@ class DistinctUntilChangedSink: Sink, ObserverType { } func on(event: Event) { - let observer = super.observer - switch event { case .Next(let value): do { diff --git a/RxSwift/Observables/Implementations/FlatMap.swift b/RxSwift/Observables/Implementations/FlatMap.swift index a00a6209..458c7cef 100644 --- a/RxSwift/Observables/Implementations/FlatMap.swift +++ b/RxSwift/Observables/Implementations/FlatMap.swift @@ -77,8 +77,6 @@ class FlatMapSink) { - let observer = super.observer - switch event { case .Next(let element): do { diff --git a/RxSwift/Observables/Implementations/Map.swift b/RxSwift/Observables/Implementations/Map.swift index 66424cba..20c6bd1a 100644 --- a/RxSwift/Observables/Implementations/Map.swift +++ b/RxSwift/Observables/Implementations/Map.swift @@ -25,8 +25,6 @@ class MapSink : Sink, ObserverType { } func on(event: Event) { - let observer = super.observer - switch event { case .Next(let element): do { diff --git a/RxSwift/Observables/Implementations/Sink.swift b/RxSwift/Observables/Implementations/Sink.swift index debaf0aa..fec16dd0 100644 --- a/RxSwift/Observables/Implementations/Sink.swift +++ b/RxSwift/Observables/Implementations/Sink.swift @@ -9,20 +9,20 @@ import Foundation class Sink : SingleAssignmentDisposable { - let observer: O + private let _observer: O func forwardOn(event: Event) { if disposed { return } - observer.on(event) + _observer.on(event) } init(observer: O) { #if TRACE_RESOURCES OSAtomicIncrement32(&resourceCount) #endif - self.observer = observer + _observer = observer } deinit {