Merge with 'swift-3.0'

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))

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

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 {

RxSwift/Cancelable.swift

@@ -15,5 +15,14 @@ public protocol Cancelable : Disposable {
     /**
     - returns: Was resource disposed.
     */
-    var disposed: Bool { get }
+    var isDisposed: Bool { get }
+}
+
+public extension Cancelable {
+
+    @available(*, deprecated, renamed: "isDisposed")
+    var disposed: Bool {
+        return isDisposed
+    }
+
 }

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
     }
 
     /**
@@ -49,8 +49,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

RxSwift/Disposables/BinaryDisposable.swift

@@ -13,7 +13,7 @@ Represents two disposable resources that are disposed together.
 */
 private final class BinaryDisposable : DisposeBase, Cancelable {
 
-    private var _disposed: AtomicInt = 0
+    private var _isDisposed: AtomicInt = 0
 
     // state
     private var _disposable1: Disposable?
@@ -22,8 +22,8 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
     /**
     - returns: Was resource disposed.
     */
-    var disposed: Bool {
-        return _disposed > 0
+    var isDisposed: Bool {
+        return _isDisposed > 0
     }
 
     /**
@@ -44,7 +44,7 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
     After invoking disposal action, disposal action will be dereferenced.
     */
     func dispose() {
-        if AtomicCompareAndSwap(0, 1, &_disposed) {
+        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
             _disposable1?.dispose()
             _disposable2?.dispose()
             _disposable1 = nil

RxSwift/Disposables/BooleanDisposable.swift

@@ -13,8 +13,8 @@ Represents a disposable resource that can be checked for disposal status.
 */
 public final 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 final 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
     }
-}
+}

RxSwift/Disposables/CompositeDisposable.swift

@@ -19,7 +19,7 @@ public final 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
     }

RxSwift/Disposables/DisposeBag.swift

@@ -37,7 +37,7 @@ public final 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 final 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 final class DisposeBag: DisposeBase {
         let disposables = _disposables
 
         _disposables.removeAll(keepingCapacity: false)
-        _disposed = true
+        _isDisposed = true
 
         return disposables
     }

RxSwift/Disposables/RefCountDisposable.swift

@@ -20,7 +20,7 @@ public final 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 final 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()
         }
     }

RxSwift/Disposables/ScheduledDisposable.swift

@@ -19,16 +19,16 @@ Represents a disposable resource whose disposal invocation will be scheduled on
 public final class ScheduledDisposable : Cancelable {
     public let scheduler: ImmediateSchedulerType
 
-    private var _disposed: AtomicInt = 0
+    private var _isDisposed: AtomicInt = 0
 
     // state
     private var _disposable: Disposable?
 
     /**
     - returns: Was resource disposed.
     */
-    public var disposed: Bool {
-        return _disposed == 1
+    public var isDisposed: Bool {
+        return _isDisposed == 1
     }
 
     /**
@@ -50,7 +50,7 @@ public final class ScheduledDisposable : Cancelable {
     }
 
     func disposeInner() {
-        if AtomicCompareAndSwap(0, 1, &_disposed) {
+        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
             _disposable!.dispose()
             _disposable = nil
         }

RxSwift/Disposables/SerialDisposable.swift

@@ -16,13 +16,13 @@ public final 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 final class SerialDisposable : DisposeBase, Cancelable {
         }
         set (newDisposable) {
             let disposable: Disposable? = _lock.calculateLocked {
-                if _disposed {
+                if _isDisposed {
                     return newDisposable
                 }
                 else {
@@ -72,14 +72,14 @@ public final 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
         }
     }
-}
+}

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
 

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
         }