From e530858bd0f478dcfead1b22f60e169773876d86 Mon Sep 17 00:00:00 2001
From: Mo Ramezanpoor <me@mohsenr.com>
Date: Fri, 29 Jul 2016 13:52:24 +0100
Subject: [PATCH 1/5] Renames `disposed` to `isDisposed` in any place that it
 makes semantically.

---
 Documentation/GettingStarted.md               |  2 +-
 RxBlocking/BlockingObservable+Operators.swift |  8 +-
 RxSwift/Cancelable.swift                      |  2 +-
 RxSwift/Disposables/AnonymousDisposable.swift | 10 +--
 RxSwift/Disposables/BinaryDisposable.swift    |  8 +-
 RxSwift/Disposables/BooleanDisposable.swift   | 18 ++--
 RxSwift/Disposables/CompositeDisposable.swift |  2 +-
 RxSwift/Disposables/DisposeBag.swift          |  6 +-
 RxSwift/Disposables/RefCountDisposable.swift  |  6 +-
 RxSwift/Disposables/ScheduledDisposable.swift |  8 +-
 RxSwift/Disposables/SerialDisposable.swift    | 14 ++--
 .../SingleAssignmentDisposable.swift          | 12 +--
 .../Observables/Implementations/Buffer.swift  |  2 +-
 .../Observables/Implementations/Debug.swift   |  2 +-
 .../Observables/Implementations/Sink.swift    |  2 +-
 .../Observables/Implementations/Timeout.swift |  2 +-
 .../Observables/Implementations/Window.swift  |  2 +-
 RxSwift/Observers/TailRecursiveSink.swift     |  6 +-
 .../Schedulers/ConcurrentMainScheduler.swift  |  2 +-
 .../Schedulers/CurrentThreadScheduler.swift   |  2 +-
 RxSwift/Schedulers/ImmediateScheduler.swift   |  2 +-
 .../Internal/DispatchQueueConfiguration.swift |  6 +-
 .../Schedulers/Internal/ScheduledItem.swift   |  6 +-
 RxSwift/Schedulers/MainScheduler.swift        |  2 +-
 .../Schedulers/OperationQueueScheduler.swift  |  2 +-
 RxSwift/Schedulers/RecursiveScheduler.swift   |  6 +-
 RxSwift/Schedulers/VirtualTimeScheduler.swift |  6 +-
 RxSwift/Subjects/BehaviorSubject.swift        | 16 ++--
 RxSwift/Subjects/PublishSubject.swift         | 14 ++--
 RxSwift/Subjects/ReplaySubject.swift          | 10 +--
 Tests/RxCocoaTests/KVOObservableTests.swift   | 84 +++++++++----------
 .../TestImplementations/Mocks/MySubject.swift |  6 +-
 Tests/RxSwiftTests/Tests/DisposableTest.swift | 20 ++---
 .../Tests/Observable+MultipleTest.swift       |  6 +-
 34 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/Documentation/GettingStarted.md b/Documentation/GettingStarted.md
index 9bc5d8b4..69453083 100644
--- a/Documentation/GettingStarted.md
+++ b/Documentation/GettingStarted.md
@@ -387,7 +387,7 @@ func myInterval(interval: NSTimeInterval) -> Observable<Int> {
             dispatch_source_cancel(timer)
         }
         dispatch_source_set_event_handler(timer, {
-            if cancel.disposed {
+            if cancel.isDisposed {
                 return
             }
             observer.on(.Next(next))
diff --git a/RxBlocking/BlockingObservable+Operators.swift b/RxBlocking/BlockingObservable+Operators.swift
index 783feeb9..3df54e5e 100644
--- a/RxBlocking/BlockingObservable+Operators.swift
+++ b/RxBlocking/BlockingObservable+Operators.swift
@@ -30,7 +30,7 @@ extension BlockingObservable {
 
         lock.dispatch {
             d.disposable = self.source.subscribe { e in
-                if d.disposed {
+                if d.isDisposed {
                     return
                 }
                 switch e {
@@ -78,7 +78,7 @@ extension BlockingObservable {
 
         lock.dispatch {
             d.disposable = self.source.subscribe { e in
-                if d.disposed {
+                if d.isDisposed {
                     return
                 }
 
@@ -130,7 +130,7 @@ extension BlockingObservable {
 
         lock.dispatch {
             d.disposable = self.source.subscribe { e in
-                if d.disposed {
+                if d.isDisposed {
                     return
                 }
                 switch e {
@@ -191,7 +191,7 @@ extension BlockingObservable {
         
         lock.dispatch {
             d.disposable = self.source.subscribe { e in
-                if d.disposed {
+                if d.isDisposed {
                     return
                 }
                 switch e {
diff --git a/RxSwift/Cancelable.swift b/RxSwift/Cancelable.swift
index 54cc82e0..7d82d8ad 100644
--- a/RxSwift/Cancelable.swift
+++ b/RxSwift/Cancelable.swift
@@ -15,5 +15,5 @@ public protocol Cancelable : Disposable {
     /**
     - returns: Was resource disposed.
     */
-    var disposed: Bool { get }
+    var isDisposed: Bool { get }
 }
diff --git a/RxSwift/Disposables/AnonymousDisposable.swift b/RxSwift/Disposables/AnonymousDisposable.swift
index 17a40910..0ee7d18e 100644
--- a/RxSwift/Disposables/AnonymousDisposable.swift
+++ b/RxSwift/Disposables/AnonymousDisposable.swift
@@ -16,14 +16,14 @@ When dispose method is called, disposal action will be dereferenced.
 public final class AnonymousDisposable : DisposeBase, Cancelable {
     public typealias DisposeAction = () -> Void
 
-    private var _disposed: AtomicInt = 0
+    private var _isDisposed: AtomicInt = 0
     private var _disposeAction: DisposeAction?
 
     /**
     - returns: Was resource disposed.
     */
-    public var disposed: Bool {
-        return _disposed == 1
+    public var isDisposed: Bool {
+        return _isDisposed == 1
     }
 
     /**
@@ -42,8 +42,8 @@ public final class AnonymousDisposable : DisposeBase, Cancelable {
     After invoking disposal action, disposal action will be dereferenced.
     */
     public func dispose() {
-        if AtomicCompareAndSwap(0, 1, &_disposed) {
-            assert(_disposed == 1)
+        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
+            assert(_isDisposed == 1)
 
             if let action = _disposeAction {
                 _disposeAction = nil
diff --git a/RxSwift/Disposables/BinaryDisposable.swift b/RxSwift/Disposables/BinaryDisposable.swift
index b6176592..5b1883b6 100644
--- a/RxSwift/Disposables/BinaryDisposable.swift
+++ b/RxSwift/Disposables/BinaryDisposable.swift
@@ -13,7 +13,7 @@ Represents two disposable resources that are disposed together.
 */
 public final class BinaryDisposable : DisposeBase, Cancelable {
 
-    private var _disposed: AtomicInt = 0
+    private var _isDisposed: AtomicInt = 0
 
     // state
     private var _disposable1: Disposable?
@@ -22,8 +22,8 @@ public final class BinaryDisposable : DisposeBase, Cancelable {
     /**
     - returns: Was resource disposed.
     */
-    public var disposed: Bool {
-        return _disposed > 0
+    public var isDisposed: Bool {
+        return _isDisposed > 0
     }
 
     /**
@@ -44,7 +44,7 @@ public final class BinaryDisposable : DisposeBase, Cancelable {
     After invoking disposal action, disposal action will be dereferenced.
     */
     public func dispose() {
-        if AtomicCompareAndSwap(0, 1, &_disposed) {
+        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
             _disposable1?.dispose()
             _disposable2?.dispose()
             _disposable1 = nil
diff --git a/RxSwift/Disposables/BooleanDisposable.swift b/RxSwift/Disposables/BooleanDisposable.swift
index 05b8a43d..a976aa43 100644
--- a/RxSwift/Disposables/BooleanDisposable.swift
+++ b/RxSwift/Disposables/BooleanDisposable.swift
@@ -13,8 +13,8 @@ Represents a disposable resource that can be checked for disposal status.
 */
 public class BooleanDisposable : Disposable, Cancelable {
  
-    internal static let BooleanDisposableTrue = BooleanDisposable(disposed: true)
-    private var _disposed = false
+    internal static let BooleanDisposableTrue = BooleanDisposable(isDisposed: true)
+    private var _isDisposed = false
     
     /**
         Initializes a new instance of the `BooleanDisposable` class
@@ -25,21 +25,21 @@ public class BooleanDisposable : Disposable, Cancelable {
     /**
         Initializes a new instance of the `BooleanDisposable` class with given value
      */
-    public init(disposed: Bool) {
-        self._disposed = disposed
+    public init(isDisposed: Bool) {
+        self._isDisposed = isDisposed
     }
     
     /**
         - returns: Was resource disposed.
      */
-    public var disposed: Bool {
-        return _disposed
+    public var isDisposed: Bool {
+        return _isDisposed
     }
     
     /**
-        Sets the status to disposed, which can be observer through the `disposed` property.
+        Sets the status to disposed, which can be observer through the `isDisposed` property.
      */
     public func dispose() {
-        _disposed = true
+        _isDisposed = true
     }
-}
\ No newline at end of file
+}
diff --git a/RxSwift/Disposables/CompositeDisposable.swift b/RxSwift/Disposables/CompositeDisposable.swift
index a60c2730..43782262 100644
--- a/RxSwift/Disposables/CompositeDisposable.swift
+++ b/RxSwift/Disposables/CompositeDisposable.swift
@@ -19,7 +19,7 @@ public class CompositeDisposable : DisposeBase, Disposable, Cancelable {
     // state
     private var _disposables: Bag<Disposable>? = Bag()
 
-    public var disposed: Bool {
+    public var isDisposed: Bool {
         _lock.lock(); defer { _lock.unlock() }
         return _disposables == nil
     }
diff --git a/RxSwift/Disposables/DisposeBag.swift b/RxSwift/Disposables/DisposeBag.swift
index c466515d..2c7b6646 100644
--- a/RxSwift/Disposables/DisposeBag.swift
+++ b/RxSwift/Disposables/DisposeBag.swift
@@ -37,7 +37,7 @@ public class DisposeBag: DisposeBase {
     
     // state
     private var _disposables = [Disposable]()
-    private var _disposed = false
+    private var _isDisposed = false
     
     /**
     Constructs new empty dispose bag.
@@ -67,7 +67,7 @@ public class DisposeBag: DisposeBase {
     
     private func _insert(_ disposable: Disposable) -> Disposable? {
         _lock.lock(); defer { _lock.unlock() }
-        if _disposed {
+        if _isDisposed {
             return disposable
         }
 
@@ -93,7 +93,7 @@ public class DisposeBag: DisposeBase {
         let disposables = _disposables
         
         _disposables.removeAll(keepingCapacity: false)
-        _disposed = true
+        _isDisposed = true
         
         return disposables
     }
diff --git a/RxSwift/Disposables/RefCountDisposable.swift b/RxSwift/Disposables/RefCountDisposable.swift
index b7e46f7d..ff299bcc 100644
--- a/RxSwift/Disposables/RefCountDisposable.swift
+++ b/RxSwift/Disposables/RefCountDisposable.swift
@@ -20,7 +20,7 @@ public class RefCountDisposable : DisposeBase, Cancelable {
     /**
      - returns: Was resource disposed.
      */
-    public var disposed: Bool {
+    public var isDisposed: Bool {
         _lock.lock(); defer { _lock.unlock() }
         return _disposable == nil
     }
@@ -110,7 +110,7 @@ public class RefCountDisposable : DisposeBase, Cancelable {
 internal final class RefCountInnerDisposable: DisposeBase, Disposable
 {
     private let _parent: RefCountDisposable
-    private var _disposed: AtomicInt = 0
+    private var _isDisposed: AtomicInt = 0
 
     init(_ parent: RefCountDisposable)
     {
@@ -120,7 +120,7 @@ internal final class RefCountInnerDisposable: DisposeBase, Disposable
 
     internal func dispose()
     {
-        if AtomicCompareAndSwap(0, 1, &_disposed) {
+        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
             _parent.release()
         }
     }
diff --git a/RxSwift/Disposables/ScheduledDisposable.swift b/RxSwift/Disposables/ScheduledDisposable.swift
index 7e13f18f..5c7b08fc 100644
--- a/RxSwift/Disposables/ScheduledDisposable.swift
+++ b/RxSwift/Disposables/ScheduledDisposable.swift
@@ -19,7 +19,7 @@ Represents a disposable resource whose disposal invocation will be scheduled on
 public class ScheduledDisposable : Cancelable {
     public let scheduler: ImmediateSchedulerType
 
-    private var _disposed: AtomicInt = 0
+    private var _isDisposed: AtomicInt = 0
 
     // state
     private var _disposable: Disposable?
@@ -27,8 +27,8 @@ public class ScheduledDisposable : Cancelable {
     /**
     - returns: Was resource disposed.
     */
-    public var disposed: Bool {
-        return _disposed == 1
+    public var isDisposed: Bool {
+        return _isDisposed == 1
     }
 
     /**
@@ -50,7 +50,7 @@ public class ScheduledDisposable : Cancelable {
     }
 
     func disposeInner() {
-        if AtomicCompareAndSwap(0, 1, &_disposed) {
+        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
             _disposable!.dispose()
             _disposable = nil
         }
diff --git a/RxSwift/Disposables/SerialDisposable.swift b/RxSwift/Disposables/SerialDisposable.swift
index cb5c4e31..ff1f40b6 100644
--- a/RxSwift/Disposables/SerialDisposable.swift
+++ b/RxSwift/Disposables/SerialDisposable.swift
@@ -16,13 +16,13 @@ public class SerialDisposable : DisposeBase, Cancelable {
     
     // state
     private var _current = nil as Disposable?
-    private var _disposed = false
+    private var _isDisposed = false
     
     /**
     - returns: Was resource disposed.
     */
-    public var disposed: Bool {
-        return _disposed
+    public var isDisposed: Bool {
+        return _isDisposed
     }
     
     /**
@@ -47,7 +47,7 @@ public class SerialDisposable : DisposeBase, Cancelable {
         }
         set (newDisposable) {
             let disposable: Disposable? = _lock.calculateLocked {
-                if _disposed {
+                if _isDisposed {
                     return newDisposable
                 }
                 else {
@@ -72,14 +72,14 @@ public class SerialDisposable : DisposeBase, Cancelable {
 
     private func _dispose() -> Disposable? {
         _lock.lock(); defer { _lock.unlock() }
-        if _disposed {
+        if _isDisposed {
             return nil
         }
         else {
-            _disposed = true
+            _isDisposed = true
             let current = _current
             _current = nil
             return current
         }
     }
-}
\ No newline at end of file
+}
diff --git a/RxSwift/Disposables/SingleAssignmentDisposable.swift b/RxSwift/Disposables/SingleAssignmentDisposable.swift
index a18ad82b..392b8f27 100644
--- a/RxSwift/Disposables/SingleAssignmentDisposable.swift
+++ b/RxSwift/Disposables/SingleAssignmentDisposable.swift
@@ -17,15 +17,15 @@ public class SingleAssignmentDisposable : DisposeBase, Disposable, Cancelable {
     private var _lock = SpinLock()
     
     // state
-    private var _disposed = false
+    private var _isDisposed = false
     private var _disposableSet = false
     private var _disposable = nil as Disposable?
 
     /**
     - returns: A value that indicates whether the object is disposed.
     */
-    public var disposed: Bool {
-        return _disposed
+    public var isDisposed: Bool {
+        return _isDisposed
     }
 
     /**
@@ -58,7 +58,7 @@ public class SingleAssignmentDisposable : DisposeBase, Disposable, Cancelable {
 
         _disposableSet = true
 
-        if _disposed {
+        if _isDisposed {
             return newValue
         }
 
@@ -71,7 +71,7 @@ public class SingleAssignmentDisposable : DisposeBase, Disposable, Cancelable {
     Disposes the underlying disposable.
     */
     public func dispose() {
-        if _disposed {
+        if _isDisposed {
             return
         }
         _dispose()?.dispose()
@@ -80,7 +80,7 @@ public class SingleAssignmentDisposable : DisposeBase, Disposable, Cancelable {
     private func _dispose() -> Disposable? {
         _lock.lock(); defer { _lock.unlock() }
 
-        _disposed = true
+        _isDisposed = true
         let disposable = _disposable
         _disposable = nil
 
diff --git a/RxSwift/Observables/Implementations/Buffer.swift b/RxSwift/Observables/Implementations/Buffer.swift
index 823a4bcb..c2a4c822 100644
--- a/RxSwift/Observables/Implementations/Buffer.swift
+++ b/RxSwift/Observables/Implementations/Buffer.swift
@@ -92,7 +92,7 @@ class BufferTimeCountSink<Element, O: ObserverType where O.E == [Element]>
     }
     
     func createTimer(_ windowID: Int) {
-        if _timerD.disposed {
+        if _timerD.isDisposed {
             return
         }
         
diff --git a/RxSwift/Observables/Implementations/Debug.swift b/RxSwift/Observables/Implementations/Debug.swift
index 43dd83cd..aa4e825b 100644
--- a/RxSwift/Observables/Implementations/Debug.swift
+++ b/RxSwift/Observables/Implementations/Debug.swift
@@ -46,7 +46,7 @@ class DebugSink<Source: ObservableType, O: ObserverType where O.E == Source.E> :
     }
     
     override func dispose() {
-        logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "disposed")
+        logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "isDisposed")
         super.dispose()
     }
 }
diff --git a/RxSwift/Observables/Implementations/Sink.swift b/RxSwift/Observables/Implementations/Sink.swift
index 90fb5d00..018fd5ea 100644
--- a/RxSwift/Observables/Implementations/Sink.swift
+++ b/RxSwift/Observables/Implementations/Sink.swift
@@ -19,7 +19,7 @@ class Sink<O : ObserverType> : SingleAssignmentDisposable {
     }
     
     final func forwardOn(_ event: Event<O.E>) {
-        if disposed {
+        if isDisposed {
             return
         }
         _observer.on(event)
diff --git a/RxSwift/Observables/Implementations/Timeout.swift b/RxSwift/Observables/Implementations/Timeout.swift
index b6f9d21c..301cd576 100644
--- a/RxSwift/Observables/Implementations/Timeout.swift
+++ b/RxSwift/Observables/Implementations/Timeout.swift
@@ -72,7 +72,7 @@ class TimeoutSink<ElementType, O: ObserverType where O.E == ElementType>: Sink<O
     }
     
     private func _createTimeoutTimer() {
-        if _timerD.disposed {
+        if _timerD.isDisposed {
             return
         }
         
diff --git a/RxSwift/Observables/Implementations/Window.swift b/RxSwift/Observables/Implementations/Window.swift
index bdb4f895..320dcda9 100644
--- a/RxSwift/Observables/Implementations/Window.swift
+++ b/RxSwift/Observables/Implementations/Window.swift
@@ -96,7 +96,7 @@ class WindowTimeCountSink<Element, O: ObserverType where O.E == Observable<Eleme
     }
     
     func createTimer(_ windowId: Int) {
-        if _timerD.disposed {
+        if _timerD.isDisposed {
             return
         }
         
diff --git a/RxSwift/Observers/TailRecursiveSink.swift b/RxSwift/Observers/TailRecursiveSink.swift
index b14644c4..caf3e2e7 100644
--- a/RxSwift/Observers/TailRecursiveSink.swift
+++ b/RxSwift/Observers/TailRecursiveSink.swift
@@ -26,7 +26,7 @@ class TailRecursiveSink<S: Sequence, O: ObserverType where S.Iterator.Element: O
     typealias SequenceGenerator = (generator: S.Iterator, remaining: IntMax?)
 
     var _generators: [SequenceGenerator] = []
-    var _disposed = false
+    var _isDisposed = false
     var _subscription = SerialDisposable()
 
     // this is thread safe object
@@ -77,7 +77,7 @@ class TailRecursiveSink<S: Sequence, O: ObserverType where S.Iterator.Element: O
                 break
             }
             
-            if _disposed {
+            if _isDisposed {
                 return
             }
 
@@ -137,7 +137,7 @@ class TailRecursiveSink<S: Sequence, O: ObserverType where S.Iterator.Element: O
     }
 
     func disposeCommand() {
-        _disposed = true
+        _isDisposed = true
         _generators.removeAll(keepingCapacity: false)
     }
 
diff --git a/RxSwift/Schedulers/ConcurrentMainScheduler.swift b/RxSwift/Schedulers/ConcurrentMainScheduler.swift
index f8ac60c1..1846ca62 100644
--- a/RxSwift/Schedulers/ConcurrentMainScheduler.swift
+++ b/RxSwift/Schedulers/ConcurrentMainScheduler.swift
@@ -53,7 +53,7 @@ public final class ConcurrentMainScheduler : SchedulerType {
         let cancel = SingleAssignmentDisposable()
 
         _mainQueue.async {
-            if cancel.disposed {
+            if cancel.isDisposed {
                 return
             }
 
diff --git a/RxSwift/Schedulers/CurrentThreadScheduler.swift b/RxSwift/Schedulers/CurrentThreadScheduler.swift
index 3428075c..e56ba048 100644
--- a/RxSwift/Schedulers/CurrentThreadScheduler.swift
+++ b/RxSwift/Schedulers/CurrentThreadScheduler.swift
@@ -120,7 +120,7 @@ public class CurrentThreadScheduler : ImmediateSchedulerType {
             }
 
             while let latest = queue.value.dequeue() {
-                if latest.disposed {
+                if latest.isDisposed {
                     continue
                 }
                 latest.invoke()
diff --git a/RxSwift/Schedulers/ImmediateScheduler.swift b/RxSwift/Schedulers/ImmediateScheduler.swift
index 82d3ec87..4da9c82d 100644
--- a/RxSwift/Schedulers/ImmediateScheduler.swift
+++ b/RxSwift/Schedulers/ImmediateScheduler.swift
@@ -28,7 +28,7 @@ private class ImmediateScheduler : ImmediateSchedulerType {
     func schedule<StateType>(_ state: StateType, action: (StateType) -> Disposable) -> Disposable {
         let disposable = SingleAssignmentDisposable()
         _asyncLock.invoke(AnonymousInvocable {
-            if disposable.disposed {
+            if disposable.isDisposed {
                 return
             }
             disposable.disposable = action(state)
diff --git a/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift b/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
index 9b5c772a..87ffae3a 100644
--- a/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
+++ b/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
@@ -25,7 +25,7 @@ extension DispatchQueueConfiguration {
         let cancel = SingleAssignmentDisposable()
 
         queue.async {
-            if cancel.disposed {
+            if cancel.isDisposed {
                 return
             }
 
@@ -57,7 +57,7 @@ extension DispatchQueueConfiguration {
         }
 
         timer.setEventHandler(handler: {
-            if compositeDisposable.disposed {
+            if compositeDisposable.isDisposed {
                 return
             }
             _ = compositeDisposable.insert(action(state))
@@ -91,7 +91,7 @@ extension DispatchQueueConfiguration {
         }
 
         timer.setEventHandler(handler: {
-            if cancelTimer.disposed {
+            if cancelTimer.isDisposed {
                 return
             }
             timerState = action(timerState)
diff --git a/RxSwift/Schedulers/Internal/ScheduledItem.swift b/RxSwift/Schedulers/Internal/ScheduledItem.swift
index 693ac41e..1a6db082 100644
--- a/RxSwift/Schedulers/Internal/ScheduledItem.swift
+++ b/RxSwift/Schedulers/Internal/ScheduledItem.swift
@@ -18,8 +18,8 @@ struct ScheduledItem<T>
 
     private let _disposable = SingleAssignmentDisposable()
 
-    var disposed: Bool {
-        return _disposable.disposed
+    var isDisposed: Bool {
+        return _disposable.isDisposed
     }
     
     init(action: Action, state: T) {
@@ -34,4 +34,4 @@ struct ScheduledItem<T>
     func dispose() {
         _disposable.dispose()
     }
-}
\ No newline at end of file
+}
diff --git a/RxSwift/Schedulers/MainScheduler.swift b/RxSwift/Schedulers/MainScheduler.swift
index 44c9f09b..adc62211 100644
--- a/RxSwift/Schedulers/MainScheduler.swift
+++ b/RxSwift/Schedulers/MainScheduler.swift
@@ -61,7 +61,7 @@ public final class MainScheduler : SerialDispatchQueueScheduler {
         let cancel = SingleAssignmentDisposable()
 
         _mainQueue.async {
-            if !cancel.disposed {
+            if !cancel.isDisposed {
                 _ = action(state)
             }
 
diff --git a/RxSwift/Schedulers/OperationQueueScheduler.swift b/RxSwift/Schedulers/OperationQueueScheduler.swift
index 24292aff..b20f3504 100644
--- a/RxSwift/Schedulers/OperationQueueScheduler.swift
+++ b/RxSwift/Schedulers/OperationQueueScheduler.swift
@@ -39,7 +39,7 @@ public class OperationQueueScheduler: ImmediateSchedulerType {
         weak var compositeDisposableWeak = compositeDisposable
         
         let operation = BlockOperation {
-            if compositeDisposableWeak?.disposed ?? false {
+            if compositeDisposableWeak?.isDisposed ?? false {
                 return
             }
             
diff --git a/RxSwift/Schedulers/RecursiveScheduler.swift b/RxSwift/Schedulers/RecursiveScheduler.swift
index c820b7d1..36191f6d 100644
--- a/RxSwift/Schedulers/RecursiveScheduler.swift
+++ b/RxSwift/Schedulers/RecursiveScheduler.swift
@@ -41,7 +41,7 @@ class AnyRecursiveScheduler<State> {
         var removeKey: CompositeDisposable.DisposeKey? = nil
         let d = _scheduler.scheduleRelative(state, dueTime: dueTime) { (state) -> Disposable in
             // best effort
-            if self._group.disposed {
+            if self._group.isDisposed {
                 return NopDisposable.instance
             }
             
@@ -84,7 +84,7 @@ class AnyRecursiveScheduler<State> {
         var removeKey: CompositeDisposable.DisposeKey? = nil
         let d = _scheduler.schedule(state) { (state) -> Disposable in
             // best effort
-            if self._group.disposed {
+            if self._group.isDisposed {
                 return NopDisposable.instance
             }
             
@@ -154,7 +154,7 @@ class RecursiveImmediateScheduler<State> {
         var removeKey: CompositeDisposable.DisposeKey? = nil
         let d = _scheduler.schedule(state) { (state) -> Disposable in
             // best effort
-            if self._group.disposed {
+            if self._group.isDisposed {
                 return NopDisposable.instance
             }
             
diff --git a/RxSwift/Schedulers/VirtualTimeScheduler.swift b/RxSwift/Schedulers/VirtualTimeScheduler.swift
index 96974f90..baefc975 100644
--- a/RxSwift/Schedulers/VirtualTimeScheduler.swift
+++ b/RxSwift/Schedulers/VirtualTimeScheduler.swift
@@ -169,7 +169,7 @@ public class VirtualTimeScheduler<Converter: VirtualTimeConverterType>
 
     func findNext() -> VirtualSchedulerItem<VirtualTime>? {
         while let front = _schedulerQueue.peek() {
-            if front.disposed {
+            if front.isDisposed {
                 _schedulerQueue.remove(front)
                 continue
             }
@@ -263,8 +263,8 @@ class VirtualSchedulerItem<Time>
     let time: Time
     let id: Int
 
-    var disposed: Bool {
-        return disposable.disposed
+    var isDisposed: Bool {
+        return disposable.isDisposed
     }
     
     var disposable = SingleAssignmentDisposable()
diff --git a/RxSwift/Subjects/BehaviorSubject.swift b/RxSwift/Subjects/BehaviorSubject.swift
index b9b7e0b3..3f7bbdd4 100644
--- a/RxSwift/Subjects/BehaviorSubject.swift
+++ b/RxSwift/Subjects/BehaviorSubject.swift
@@ -33,7 +33,7 @@ public final class BehaviorSubject<Element>
     let _lock = NSRecursiveLock()
     
     // state
-    private var _disposed = false
+    private var _isDisposed = false
     private var _value: Element
     private var _observers = Bag<AnyObserver<Element>>()
     private var _stoppedEvent: Event<Element>?
@@ -41,8 +41,8 @@ public final class BehaviorSubject<Element>
     /**
     Indicates whether the subject has been disposed.
     */
-    public var disposed: Bool {
-        return _disposed
+    public var isDisposed: Bool {
+        return _isDisposed
     }
  
     /**
@@ -61,7 +61,7 @@ public final class BehaviorSubject<Element>
     */
     public func value() throws -> Element {
         _lock.lock(); defer { _lock.unlock() } // {
-            if _disposed {
+            if _isDisposed {
                 throw RxError.disposed(object: self)
             }
             
@@ -86,7 +86,7 @@ public final class BehaviorSubject<Element>
     }
 
     func _synchronized_on(_ event: Event<E>) {
-        if _stoppedEvent != nil || _disposed {
+        if _stoppedEvent != nil || _isDisposed {
             return
         }
         
@@ -112,7 +112,7 @@ public final class BehaviorSubject<Element>
     }
 
     func _synchronized_subscribe<O : ObserverType where O.E == E>(_ observer: O) -> Disposable {
-        if _disposed {
+        if _isDisposed {
             observer.on(.error(RxError.disposed(object: self)))
             return NopDisposable.instance
         }
@@ -134,7 +134,7 @@ public final class BehaviorSubject<Element>
     }
 
     func _synchronized_unsubscribe(_ disposeKey: DisposeKey) {
-        if _disposed {
+        if _isDisposed {
             return
         }
 
@@ -153,7 +153,7 @@ public final class BehaviorSubject<Element>
     */
     public func dispose() {
         _lock.performLocked {
-            _disposed = true
+            _isDisposed = true
             _observers.removeAll()
             _stoppedEvent = nil
         }
diff --git a/RxSwift/Subjects/PublishSubject.swift b/RxSwift/Subjects/PublishSubject.swift
index 8404c4a6..914f745c 100644
--- a/RxSwift/Subjects/PublishSubject.swift
+++ b/RxSwift/Subjects/PublishSubject.swift
@@ -34,16 +34,16 @@ final public class PublishSubject<Element>
     private var _lock = NSRecursiveLock()
     
     // state
-    private var _disposed = false
+    private var _isDisposed = false
     private var _observers = Bag<AnyObserver<Element>>()
     private var _stopped = false
     private var _stoppedEvent = nil as Event<Element>?
     
     /**
-    Indicates whether the subject has been disposed.
+    Indicates whether the subject has been isDisposed.
     */
-    public var disposed: Bool {
-        return _disposed
+    public var isDisposed: Bool {
+        return _isDisposed
     }
     
     /**
@@ -66,7 +66,7 @@ final public class PublishSubject<Element>
     func _synchronized_on(_ event: Event<E>) {
         switch event {
         case .next(_):
-            if _disposed || _stopped {
+            if _isDisposed || _stopped {
                 return
             }
             
@@ -98,7 +98,7 @@ final public class PublishSubject<Element>
             return NopDisposable.instance
         }
         
-        if _disposed {
+        if _isDisposed {
             observer.on(.error(RxError.disposed(object: self)))
             return NopDisposable.instance
         }
@@ -132,7 +132,7 @@ final public class PublishSubject<Element>
     }
 
     final func _synchronized_dispose() {
-        _disposed = true
+        _isDisposed = true
         _observers.removeAll()
         _stoppedEvent = nil
     }
diff --git a/RxSwift/Subjects/ReplaySubject.swift b/RxSwift/Subjects/ReplaySubject.swift
index 88401783..566b97fc 100644
--- a/RxSwift/Subjects/ReplaySubject.swift
+++ b/RxSwift/Subjects/ReplaySubject.swift
@@ -31,7 +31,7 @@ public class ReplaySubject<Element>
     private var _lock = NSRecursiveLock()
     
     // state
-    private var _disposed = false
+    private var _isDisposed = false
     private var _stoppedEvent = nil as Event<Element>?
     private var _observers = Bag<AnyObserver<Element>>()
     
@@ -110,7 +110,7 @@ class ReplayBufferBase<Element>
     }
 
     func _synchronized_on(_ event: Event<E>) {
-        if _disposed {
+        if _isDisposed {
             return
         }
         
@@ -137,7 +137,7 @@ class ReplayBufferBase<Element>
     }
 
     func _synchronized_subscribe<O : ObserverType where O.E == E>(_ observer: O) -> Disposable {
-        if _disposed {
+        if _isDisposed {
             observer.on(.error(RxError.disposed(object: self)))
             return NopDisposable.instance
         }
@@ -161,7 +161,7 @@ class ReplayBufferBase<Element>
     }
 
     func _synchronized_unsubscribe(_ disposeKey: DisposeKey) {
-        if _disposed {
+        if _isDisposed {
             return
         }
         
@@ -180,7 +180,7 @@ class ReplayBufferBase<Element>
     }
 
     func _synchronized_dispose() {
-        _disposed = true
+        _isDisposed = true
         _stoppedEvent = nil
         _observers.removeAll()
     }
diff --git a/Tests/RxCocoaTests/KVOObservableTests.swift b/Tests/RxCocoaTests/KVOObservableTests.swift
index 5e57a3e2..332ba86c 100644
--- a/Tests/RxCocoaTests/KVOObservableTests.swift
+++ b/Tests/RxCocoaTests/KVOObservableTests.swift
@@ -241,7 +241,7 @@ extension KVOObservableTests {
     
     func test_ObserveAndDontRetainWorks() {
         var latest: String?
-        var disposed = false
+        var isDisposed = false
         
         var parent: Parent! = Parent { n in
             latest = n
@@ -249,26 +249,26 @@ extension KVOObservableTests {
         
         _ = parent.rx_deallocated
             .subscribe(onCompleted: {
-                disposed = true
+                isDisposed = true
             })
         
         XCTAssertTrue(latest == "")
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         parent.val = "1"
         
         XCTAssertTrue(latest == "1")
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         parent = nil
         
         XCTAssertTrue(latest == "1")
-        XCTAssertTrue(disposed == true)
+        XCTAssertTrue(isDisposed == true)
     }
     
     func test_ObserveAndDontRetainWorks2() {
         var latest: String?
-        var disposed = false
+        var isDisposed = false
         
         var parent: ParentWithChild! = ParentWithChild { n in
             latest = n
@@ -276,21 +276,21 @@ extension KVOObservableTests {
         
         _ = parent.rx_deallocated
             .subscribe(onCompleted: {
-                disposed = true
+                isDisposed = true
             })
         
         XCTAssertTrue(latest == "")
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         parent.val = "1"
         
         XCTAssertTrue(latest == "1")
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         parent = nil
         
         XCTAssertTrue(latest == "1")
-        XCTAssertTrue(disposed == true)
+        XCTAssertTrue(isDisposed == true)
     }
 }
 
@@ -301,7 +301,7 @@ extension KVOObservableTests {
     
     func testObserveWeak_SimpleStrongProperty() {
         var latest: String?
-        var disposed = false
+        var isDisposed = false
         
         var root: HasStrongProperty! = HasStrongProperty()
         
@@ -312,26 +312,26 @@ extension KVOObservableTests {
         
         _ = root.rx_deallocated
             .subscribe(onCompleted: {
-                disposed = true
+                isDisposed = true
             })
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(!disposed)
+        XCTAssertTrue(!isDisposed)
         
         root.property = "a"
 
         XCTAssertTrue(latest == "a")
-        XCTAssertTrue(!disposed)
+        XCTAssertTrue(!isDisposed)
         
         root = nil
 
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed)
+        XCTAssertTrue(isDisposed)
     }
     
     func testObserveWeak_SimpleWeakProperty() {
         var latest: String?
-        var disposed = false
+        var isDisposed = false
         
         var root: HasWeakProperty! = HasWeakProperty()
         
@@ -342,28 +342,28 @@ extension KVOObservableTests {
         
         _ = root.rx_deallocated
             .subscribe(onCompleted: {
-                disposed = true
+                isDisposed = true
         })
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(!disposed)
+        XCTAssertTrue(!isDisposed)
     
         let a: NSString! = "a"
         
         root.property = a
         
         XCTAssertTrue(latest == "a")
-        XCTAssertTrue(!disposed)
+        XCTAssertTrue(!isDisposed)
         
         root = nil
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed)
+        XCTAssertTrue(isDisposed)
     }
 
     func testObserveWeak_ObserveFirst_Weak_Strong_Basic() {
         var latest: String?
-        var disposed = false
+        var isDisposed = false
         
         var child: HasStrongProperty! = HasStrongProperty()
         
@@ -376,34 +376,34 @@ extension KVOObservableTests {
         
         _ = root.rx_deallocated
             .subscribe(onCompleted: {
-                disposed = true
+                isDisposed = true
             })
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         root.property = child
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         let one: NSString! = "1"
         
         child.property = one
         
         XCTAssertTrue(latest == "1")
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         root = nil
         child = nil
      
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == true)
+        XCTAssertTrue(isDisposed == true)
     }
     
     func testObserveWeak_Weak_Strong_Observe_Basic() {
         var latest: String?
-        var disposed = false
+        var isDisposed = false
         
         var child: HasStrongProperty! = HasStrongProperty()
         
@@ -416,7 +416,7 @@ extension KVOObservableTests {
         child.property = one
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         _ = root.rx_observeWeakly(String.self, "property.property")
             .subscribe(onNext: { n in
@@ -425,22 +425,22 @@ extension KVOObservableTests {
         
         _ = root.rx_deallocated
             .subscribe(onCompleted: {
-                disposed = true
+                isDisposed = true
         })
         
         XCTAssertTrue(latest == "1")
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         root = nil
         child = nil
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == true)
+        XCTAssertTrue(isDisposed == true)
     }
     
     func testObserveWeak_ObserveFirst_Strong_Weak_Basic() {
         var latest: String?
-        var disposed = false
+        var isDisposed = false
         
         var child: HasWeakProperty! = HasWeakProperty()
         
@@ -453,34 +453,34 @@ extension KVOObservableTests {
         
         _ = root.rx_deallocated
             .subscribe(onCompleted: {
-                disposed = true
+                isDisposed = true
         })
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         root.property = child
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         let one: NSString! = "1"
         
         child.property = one
         
         XCTAssertTrue(latest == "1")
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         root = nil
         child = nil
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == true)
+        XCTAssertTrue(isDisposed == true)
     }
     
     func testObserveWeak_Strong_Weak_Observe_Basic() {
         var latest: String?
-        var disposed = false
+        var isDisposed = false
         
         var child: HasWeakProperty! = HasWeakProperty()
         
@@ -493,7 +493,7 @@ extension KVOObservableTests {
         child.property = one
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         _ = root.rx_observeWeakly(String.self, "property.property")
             .subscribe(onNext: { n in
@@ -502,17 +502,17 @@ extension KVOObservableTests {
         
         _ = root.rx_deallocated
             .subscribe(onCompleted: {
-                disposed = true
+                isDisposed = true
         })
         
         XCTAssertTrue(latest == "1")
-        XCTAssertTrue(disposed == false)
+        XCTAssertTrue(isDisposed == false)
         
         root = nil
         child = nil
         
         XCTAssertTrue(latest == nil)
-        XCTAssertTrue(disposed == true)
+        XCTAssertTrue(isDisposed == true)
     }
     
     // compiler won't release weak references otherwise :(
diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift
index 9115e157..3b6640d2 100644
--- a/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift
+++ b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift
@@ -16,14 +16,14 @@ class MySubject<Element where Element : Hashable> : SubjectType, ObserverType {
     var _disposeOn: [Element : Disposable] = [:]
     var _observer: AnyObserver<Element>! = nil
     var _subscribeCount: Int = 0
-    var _disposed: Bool = false
+    var _isDisposed: Bool = false
     
     var subscribeCount: Int {
         return _subscribeCount
     }
     
     var diposed: Bool {
-        return _disposed
+        return _isDisposed
     }
     
     func disposeOn(_ value: Element, disposable: Disposable) {
@@ -47,7 +47,7 @@ class MySubject<Element where Element : Hashable> : SubjectType, ObserverType {
         
         return AnonymousDisposable {
             self._observer = AnyObserver { _ -> Void in () }
-            self._disposed = true
+            self._isDisposed = true
         }
     }
 
diff --git a/Tests/RxSwiftTests/Tests/DisposableTest.swift b/Tests/RxSwiftTests/Tests/DisposableTest.swift
index dead2cbe..d094390d 100644
--- a/Tests/RxSwiftTests/Tests/DisposableTest.swift
+++ b/Tests/RxSwiftTests/Tests/DisposableTest.swift
@@ -158,21 +158,21 @@ class DisposableTest : RxTest {
         let d = BooleanDisposable()
         let r = RefCountDisposable(disposable: d)
         
-        XCTAssertEqual(r.disposed, false)
+        XCTAssertEqual(r.isDisposed, false)
         
         let d1 = r.retain()
         let d2 = r.retain()
         
-        XCTAssertEqual(d.disposed, false)
+        XCTAssertEqual(d.isDisposed, false)
         
         d1.dispose()
-        XCTAssertEqual(d.disposed, false)
+        XCTAssertEqual(d.isDisposed, false)
         
         d2.dispose()
-        XCTAssertEqual(d.disposed, false)
+        XCTAssertEqual(d.isDisposed, false)
         
         r.dispose()
-        XCTAssertEqual(d.disposed, true)
+        XCTAssertEqual(d.isDisposed, true)
         
         let d3 = r.retain()
         d3.dispose()
@@ -182,21 +182,21 @@ class DisposableTest : RxTest {
         let d = BooleanDisposable()
         let r = RefCountDisposable(disposable: d)
         
-        XCTAssertEqual(r.disposed, false)
+        XCTAssertEqual(r.isDisposed, false)
         
         let d1 = r.retain()
         let d2 = r.retain()
         
-        XCTAssertEqual(d.disposed, false)
+        XCTAssertEqual(d.isDisposed, false)
         
         d1.dispose()
-        XCTAssertEqual(d.disposed, false)
+        XCTAssertEqual(d.isDisposed, false)
         
         r.dispose()
-        XCTAssertEqual(d.disposed, false)
+        XCTAssertEqual(d.isDisposed, false)
         
         d2.dispose()
-        XCTAssertEqual(d.disposed, true)
+        XCTAssertEqual(d.isDisposed, true)
         
     }
 }
diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
index fa92d951..21381353 100644
--- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
@@ -4251,7 +4251,7 @@ extension ObservableMultipleTest {
     func testSkipUntil_HasCompletedCausesDisposal() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        var disposed = false
+        var isDisposed = false
         
         let l = scheduler.createHotObservable([
             next(150, 1),
@@ -4264,7 +4264,7 @@ extension ObservableMultipleTest {
         
         let r: Observable<Int> = Observable.create { o in
             return AnonymousDisposable {
-                disposed = true
+                isDisposed = true
             }
         }
         
@@ -4275,7 +4275,7 @@ extension ObservableMultipleTest {
         XCTAssertEqual(res.events, [
         ])
         
-        XCTAssert(disposed, "disposed")
+        XCTAssert(isDisposed, "isDisposed")
     }
 }
 

From 6887745089c896d0fb4b75cb338c281f7766f6d8 Mon Sep 17 00:00:00 2001
From: Mo Ramezanpoor <me@mohsenr.com>
Date: Fri, 29 Jul 2016 13:56:12 +0100
Subject: [PATCH 2/5] Renames `MySubject.diposed` (with a typo) to
 `.isDisposed`.

---
 Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift | 2 +-
 Tests/RxSwiftTests/Tests/Observable+BindingTest.swift        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift
index 3b6640d2..75cf69a7 100644
--- a/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift
+++ b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift
@@ -22,7 +22,7 @@ class MySubject<Element where Element : Hashable> : SubjectType, ObserverType {
         return _subscribeCount
     }
     
-    var diposed: Bool {
+    var isDisposed: Bool {
         return _isDisposed
     }
     
diff --git a/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift b/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift
index 9ea84f27..c45fce92 100644
--- a/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift
@@ -293,7 +293,7 @@ extension ObservableBindingTest {
             completed(250)
         ])
         
-        XCTAssertTrue(subject.diposed)
+        XCTAssertTrue(subject.isDisposed)
     }
     
     func testRefCount_NotConnected() {

From d3eacdfcb5bd444a759b576c184d5c09c9a72a4a Mon Sep 17 00:00:00 2001
From: Mo Ramezanpoor <me@mohsenr.com>
Date: Tue, 9 Aug 2016 10:05:49 +0100
Subject: [PATCH 3/5] BinaryDisposable is no longer public.

---
 RxSwift/Disposables/BinaryDisposable.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/RxSwift/Disposables/BinaryDisposable.swift b/RxSwift/Disposables/BinaryDisposable.swift
index 5b1883b6..416d741f 100644
--- a/RxSwift/Disposables/BinaryDisposable.swift
+++ b/RxSwift/Disposables/BinaryDisposable.swift
@@ -11,7 +11,7 @@ import Foundation
 /**
 Represents two disposable resources that are disposed together.
 */
-public final class BinaryDisposable : DisposeBase, Cancelable {
+final class BinaryDisposable : DisposeBase, Cancelable {
 
     private var _isDisposed: AtomicInt = 0
 
@@ -22,7 +22,7 @@ public final class BinaryDisposable : DisposeBase, Cancelable {
     /**
     - returns: Was resource disposed.
     */
-    public var isDisposed: Bool {
+    var isDisposed: Bool {
         return _isDisposed > 0
     }
 
@@ -43,7 +43,7 @@ public final class BinaryDisposable : DisposeBase, Cancelable {
 
     After invoking disposal action, disposal action will be dereferenced.
     */
-    public func dispose() {
+    func dispose() {
         if AtomicCompareAndSwap(0, 1, &_isDisposed) {
             _disposable1?.dispose()
             _disposable2?.dispose()

From b0a819981b384d010d11a38130421c98df5c96c7 Mon Sep 17 00:00:00 2001
From: Mo Ramezanpoor <me@mohsenr.com>
Date: Tue, 9 Aug 2016 10:12:55 +0100
Subject: [PATCH 4/5] Implement `Cancelable.disposed` as an extension.

---
 RxSwift/Cancelable.swift | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/RxSwift/Cancelable.swift b/RxSwift/Cancelable.swift
index 7d82d8ad..209379c1 100644
--- a/RxSwift/Cancelable.swift
+++ b/RxSwift/Cancelable.swift
@@ -17,3 +17,12 @@ public protocol Cancelable : Disposable {
     */
     var isDisposed: Bool { get }
 }
+
+public extension Cancelable {
+    
+    @available(*, deprecated, renamed: "isDisposed")
+    var disposed: Bool {
+        return isDisposed
+    }
+    
+}

From 2e4b6990e86c2cab5f73b9817878b02527472983 Mon Sep 17 00:00:00 2001
From: Rene Hexel <r.hexel@griffith.edu.au>
Date: Wed, 10 Aug 2016 09:45:23 +1000
Subject: [PATCH 5/5] Update for Xcode 8 beta 5

---
 Package.swift | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Package.swift b/Package.swift
index 99b9b3bf..c088c2f5 100644
--- a/Package.swift
+++ b/Package.swift
@@ -3,11 +3,6 @@ import PackageDescription
 #if os(OSX)
 let package = Package(
     name: "RxSwift",
-    exclude: [
-        "Sources/RxCocoa",
-        "Sources/RxTests",
-        "Sources/AllTests"
-    ],
     targets: [
         Target(
             name: "RxSwift"
@@ -32,14 +27,16 @@ let package = Package(
                 .Target(name: "RxTests")
             ]
         )
+    ],
+    exclude: [
+        "Sources/RxCocoa",
+        "Sources/RxTests",
+        "Sources/AllTests"
     ]
 )
 #elseif os(Linux)
 let package = Package(
     name: "RxSwift",
-    exclude: [
-        "Sources/RxCocoa",
-    ],
     targets: [
         Target(
             name: "RxSwift"
@@ -64,6 +61,9 @@ let package = Package(
                 .Target(name: "RxTests")
             ]
         )
+    ],
+    exclude: [
+        "Sources/RxCocoa",
     ]
 )
 #endif