From 64526c8dcdc9556049fafde979a0930e248c97a7 Mon Sep 17 00:00:00 2001
From: Mo Ramezanpoor <me@mohsenr.com>
Date: Wed, 10 Aug 2016 14:49:21 +0100
Subject: [PATCH] Replaces all calls to `StableCompositeDisposable.create()`
 with `Disposables.create()`.

---
 RxExample/RxExample/Operators.swift                      | 4 ++--
 RxSwift/Observables/Implementations/AddRef.swift         | 2 +-
 RxSwift/Observables/Implementations/Amb.swift            | 2 +-
 RxSwift/Observables/Implementations/Buffer.swift         | 2 +-
 RxSwift/Observables/Implementations/RetryWhen.swift      | 2 +-
 RxSwift/Observables/Implementations/Sample.swift         | 2 +-
 RxSwift/Observables/Implementations/SkipUntil.swift      | 2 +-
 RxSwift/Observables/Implementations/Switch.swift         | 2 +-
 RxSwift/Observables/Implementations/TakeUntil.swift      | 2 +-
 RxSwift/Observables/Implementations/Throttle.swift       | 2 +-
 RxSwift/Observables/Implementations/Timeout.swift        | 2 +-
 RxSwift/Observables/Implementations/Using.swift          | 4 ++--
 RxSwift/Observables/Implementations/WithLatestFrom.swift | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/RxExample/RxExample/Operators.swift b/RxExample/RxExample/Operators.swift
index 59c9e795..1ed6126b 100644
--- a/RxExample/RxExample/Operators.swift
+++ b/RxExample/RxExample/Operators.swift
@@ -69,7 +69,7 @@ func <-> (textInput: RxTextInput, variable: Variable<String>) -> Disposable {
             bindToUIDisposable.dispose()
         })
 
-    return StableCompositeDisposable.create(bindToUIDisposable, bindToVariable)
+    return Disposables.create(bindToUIDisposable, bindToVariable)
 }
 
 func <-> <T>(property: ControlProperty<T>, variable: Variable<T>) -> Disposable {
@@ -92,7 +92,7 @@ func <-> <T>(property: ControlProperty<T>, variable: Variable<T>) -> Disposable
             bindToUIDisposable.dispose()
         })
 
-    return StableCompositeDisposable.create(bindToUIDisposable, bindToVariable)
+    return Disposables.create(bindToUIDisposable, bindToVariable)
 }
 
 // }
diff --git a/RxSwift/Observables/Implementations/AddRef.swift b/RxSwift/Observables/Implementations/AddRef.swift
index 25671285..44b7f079 100644
--- a/RxSwift/Observables/Implementations/AddRef.swift
+++ b/RxSwift/Observables/Implementations/AddRef.swift
@@ -40,7 +40,7 @@ class AddRef<Element> : Producer<Element> {
     override func run<O: ObserverType where O.E == Element>(_ observer: O) -> Disposable {
         let releaseDisposable = _refCount.retain()
         let sink = AddRefSink(observer: observer)
-        sink.disposable = StableCompositeDisposable.create(releaseDisposable, _source.subscribeSafe(sink))
+        sink.disposable = Disposables.create(releaseDisposable, _source.subscribeSafe(sink))
 
         return sink
     }
diff --git a/RxSwift/Observables/Implementations/Amb.swift b/RxSwift/Observables/Implementations/Amb.swift
index 9ea6d8d3..7e85093d 100644
--- a/RxSwift/Observables/Implementations/Amb.swift
+++ b/RxSwift/Observables/Implementations/Amb.swift
@@ -66,7 +66,7 @@ class AmbSink<ElementType, O: ObserverType where O.E == ElementType> : Sink<O> {
     func run() -> Disposable {
         let subscription1 = SingleAssignmentDisposable()
         let subscription2 = SingleAssignmentDisposable()
-        let disposeAll = StableCompositeDisposable.create(subscription1, subscription2)
+        let disposeAll = Disposables.create(subscription1, subscription2)
         
         let forwardEvent = { (o: AmbObserverType, event: Event<ElementType>) -> Void in
             self.forwardOn(event)
diff --git a/RxSwift/Observables/Implementations/Buffer.swift b/RxSwift/Observables/Implementations/Buffer.swift
index 5025e81a..7757787d 100644
--- a/RxSwift/Observables/Implementations/Buffer.swift
+++ b/RxSwift/Observables/Implementations/Buffer.swift
@@ -53,7 +53,7 @@ class BufferTimeCountSink<Element, O: ObserverType where O.E == [Element]>
  
     func run() -> Disposable {
         createTimer(_windowID)
-        return StableCompositeDisposable.create(_timerD, _parent._source.subscribe(self))
+        return Disposables.create(_timerD, _parent._source.subscribe(self))
     }
     
     func startNewWindowAndSendCurrentOne() {
diff --git a/RxSwift/Observables/Implementations/RetryWhen.swift b/RxSwift/Observables/Implementations/RetryWhen.swift
index e5fb9f38..5c483e27 100644
--- a/RxSwift/Observables/Implementations/RetryWhen.swift
+++ b/RxSwift/Observables/Implementations/RetryWhen.swift
@@ -127,7 +127,7 @@ class RetryWhenSequenceSink<S: Sequence, O: ObserverType, TriggerObservable: Obs
     override func run(_ sources: SequenceGenerator) -> Disposable {
         let triggerSubscription = _handler.subscribe(_notifier.asObserver())
         let superSubscription = super.run(sources)
-        return StableCompositeDisposable.create(superSubscription, triggerSubscription)
+        return Disposables.create(superSubscription, triggerSubscription)
     }
 }
 
diff --git a/RxSwift/Observables/Implementations/Sample.swift b/RxSwift/Observables/Implementations/Sample.swift
index 4906552d..33f3f407 100644
--- a/RxSwift/Observables/Implementations/Sample.swift
+++ b/RxSwift/Observables/Implementations/Sample.swift
@@ -88,7 +88,7 @@ class SampleSequenceSink<O: ObserverType, SampleType>
         _sourceSubscription.disposable = _parent._source.subscribe(self)
         let samplerSubscription = _parent._sampler.subscribe(SamplerSink(parent: self))
         
-        return StableCompositeDisposable.create(_sourceSubscription, samplerSubscription)
+        return Disposables.create(_sourceSubscription, samplerSubscription)
     }
     
     func on(_ event: Event<Element>) {
diff --git a/RxSwift/Observables/Implementations/SkipUntil.swift b/RxSwift/Observables/Implementations/SkipUntil.swift
index ae59b7e9..43122869 100644
--- a/RxSwift/Observables/Implementations/SkipUntil.swift
+++ b/RxSwift/Observables/Implementations/SkipUntil.swift
@@ -103,7 +103,7 @@ class SkipUntilSink<ElementType, Other, O: ObserverType where O.E == ElementType
         _sourceSubscription.disposable = sourceSubscription
         otherObserver._subscription.disposable = otherSubscription
         
-        return StableCompositeDisposable.create(_sourceSubscription, otherObserver._subscription)
+        return Disposables.create(_sourceSubscription, otherObserver._subscription)
     }
 }
 
diff --git a/RxSwift/Observables/Implementations/Switch.swift b/RxSwift/Observables/Implementations/Switch.swift
index 5445ee38..b79dd142 100644
--- a/RxSwift/Observables/Implementations/Switch.swift
+++ b/RxSwift/Observables/Implementations/Switch.swift
@@ -32,7 +32,7 @@ class SwitchSink<SourceType, S: ObservableConvertibleType, O: ObserverType where
     func run(_ source: Observable<SourceType>) -> Disposable {
         let subscription = source.subscribe(self)
         _subscriptions.disposable = subscription
-        return StableCompositeDisposable.create(_subscriptions, _innerSubscription)
+        return Disposables.create(_subscriptions, _innerSubscription)
     }
     
     func on(_ event: Event<E>) {
diff --git a/RxSwift/Observables/Implementations/TakeUntil.swift b/RxSwift/Observables/Implementations/TakeUntil.swift
index d59fc8f1..dab392d4 100644
--- a/RxSwift/Observables/Implementations/TakeUntil.swift
+++ b/RxSwift/Observables/Implementations/TakeUntil.swift
@@ -98,7 +98,7 @@ class TakeUntilSink<ElementType, Other, O: ObserverType where O.E == ElementType
         otherObserver._subscription.disposable = otherSubscription
         let sourceSubscription = _parent._source.subscribe(self)
         
-        return StableCompositeDisposable.create(sourceSubscription, otherObserver._subscription)
+        return Disposables.create(sourceSubscription, otherObserver._subscription)
     }
 }
 
diff --git a/RxSwift/Observables/Implementations/Throttle.swift b/RxSwift/Observables/Implementations/Throttle.swift
index f85bb6f7..598b6089 100644
--- a/RxSwift/Observables/Implementations/Throttle.swift
+++ b/RxSwift/Observables/Implementations/Throttle.swift
@@ -35,7 +35,7 @@ class ThrottleSink<O: ObserverType>
     func run() -> Disposable {
         let subscription = _parent._source.subscribe(self)
         
-        return StableCompositeDisposable.create(subscription, cancellable)
+        return Disposables.create(subscription, cancellable)
     }
 
     func on(_ event: Event<Element>) {
diff --git a/RxSwift/Observables/Implementations/Timeout.swift b/RxSwift/Observables/Implementations/Timeout.swift
index 5c586e36..6244e555 100644
--- a/RxSwift/Observables/Implementations/Timeout.swift
+++ b/RxSwift/Observables/Implementations/Timeout.swift
@@ -35,7 +35,7 @@ class TimeoutSink<ElementType, O: ObserverType where O.E == ElementType>: Sink<O
         
         original.disposable = _parent._source.subscribeSafe(self)
         
-        return StableCompositeDisposable.create(_subscription, _timerD)
+        return Disposables.create(_subscription, _timerD)
     }
 
     func on(_ event: Event<E>) {
diff --git a/RxSwift/Observables/Implementations/Using.swift b/RxSwift/Observables/Implementations/Using.swift
index a3d4d176..11c2f254 100644
--- a/RxSwift/Observables/Implementations/Using.swift
+++ b/RxSwift/Observables/Implementations/Using.swift
@@ -28,12 +28,12 @@ class UsingSink<SourceType, ResourceType: Disposable, O: ObserverType where O.E
             disposable = resource
             let source = try _parent._observableFactory(resource)
             
-            return StableCompositeDisposable.create(
+            return Disposables.create(
                 source.subscribe(self),
                 disposable
             )
         } catch let error {
-            return StableCompositeDisposable.create(
+            return Disposables.create(
                 Observable.error(error).subscribe(self),
                 disposable
             )
diff --git a/RxSwift/Observables/Implementations/WithLatestFrom.swift b/RxSwift/Observables/Implementations/WithLatestFrom.swift
index 4fff52fb..9f5f50cf 100644
--- a/RxSwift/Observables/Implementations/WithLatestFrom.swift
+++ b/RxSwift/Observables/Implementations/WithLatestFrom.swift
@@ -35,7 +35,7 @@ class WithLatestFromSink<FirstType, SecondType, ResultType, O: ObserverType wher
         sndSubscription.disposable = _parent._second.subscribe(sndO)
         let fstSubscription = _parent._first.subscribe(self)
         
-        return StableCompositeDisposable.create(fstSubscription, sndSubscription)
+        return Disposables.create(fstSubscription, sndSubscription)
     }
 
     func on(_ event: Event<E>) {