From 99e5579f20cd212df1d5166386207ecd02faaaa9 Mon Sep 17 00:00:00 2001
From: Krunoslav Zaher <krunoslav.zaher@gmail.com>
Date: Sun, 31 Jan 2016 23:07:18 +0100
Subject: [PATCH] Adds optional parameter to `timer` operator.

---
 RxSwift/Observables/Observable+Time.swift     | 23 +------------------
 .../Tests/Observable+SingleTest.swift         |  4 ++--
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/RxSwift/Observables/Observable+Time.swift b/RxSwift/Observables/Observable+Time.swift
index da8ae672..9050ce54 100644
--- a/RxSwift/Observables/Observable+Time.swift
+++ b/RxSwift/Observables/Observable+Time.swift
@@ -103,7 +103,7 @@ extension Observable where Element: SignedIntegerType {
     - returns: An observable sequence that produces a value after due time has elapsed and then each period.
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func timer(dueTime: RxTimeInterval, period: RxTimeInterval, scheduler: SchedulerType)
+    public static func timer(dueTime: RxTimeInterval, period: RxTimeInterval? = nil, scheduler: SchedulerType)
         -> Observable<E> {
         return Timer(
             dueTime: dueTime,
@@ -113,27 +113,6 @@ extension Observable where Element: SignedIntegerType {
     }
 }
 
-extension Observable where Element: SignedIntegerType {
-    /**
-    Returns an observable sequence that produces a single value at the specified absolute due time, using the specified scheduler to run the timer.
-
-    - seealso: [timer operator on reactivex.io](http://reactivex.io/documentation/operators/timer.html)
-
-    - parameter dueTime: Time interval after which to produce the value.
-    - parameter scheduler: Scheduler to run the timer on.
-    - returns: An observable sequence that produces a value at due time.
-    */
-    @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func timer(dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable<E> {
-        return Timer(
-            dueTime: dueTime,
-            period: nil,
-            scheduler: scheduler
-        )
-    }
-}
-
 // MARK: take
 
 extension ObservableType {
diff --git a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift
index 77a34eab..8151d397 100644
--- a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift
@@ -1307,12 +1307,12 @@ extension ObservableSingleTest {
                 errors.scan((0, nil)) { (a: (Int, NSError!), e) in
                     (a.0 + 1, e)
                 }
-                .flatMap { (a, e) -> Observable<Int> in
+                .flatMap { (a, e) -> Observable<Int64> in
                     if a >= 4 {
                         return Observable.error(e)
                     }
 
-                    return Observable<Int>.timer(RxTimeInterval(a * 50), scheduler: scheduler)
+                    return Observable<Int64>.timer(RxTimeInterval(a * 50), scheduler: scheduler)
                 }
             }
         }