From 753520b40659634adfa910b2f74b087a3665c2e0 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Thu, 13 Aug 2015 22:23:25 +0200 Subject: [PATCH] `trySend` to `?.on` and cleanup for `timer` --- RxSwift/RxSwift/Observables/Implementations/Timer.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RxSwift/RxSwift/Observables/Implementations/Timer.swift b/RxSwift/RxSwift/Observables/Implementations/Timer.swift index 5d10a7e5..400f8374 100644 --- a/RxSwift/RxSwift/Observables/Implementations/Timer.swift +++ b/RxSwift/RxSwift/Observables/Implementations/Timer.swift @@ -20,7 +20,7 @@ class TimerSink : Sink Disposable { let result = self.parent.schedulePeriodic(state: 0, startAfter: self.parent.dueTime, period: self.parent.period!) { state in - trySendNext(self.observer, state) + self.observer?.on(.Next(state)) return state &+ 1 } @@ -40,8 +40,8 @@ class TimerOneOffSink : func run() -> Disposable { let result = self.parent.scheduler.scheduleRelative((), dueTime: self.parent.dueTime) { (_) -> RxResult in - trySendNext(self.observer, 0) - trySendCompleted(self.observer) + self.observer?.on(.Next(0)) + self.observer?.on(.Completed) return NopDisposableResult }