From eaddcb2902ceb9d62a3b3943cd0112df4fe80263 Mon Sep 17 00:00:00 2001 From: yury Date: Sat, 3 Oct 2015 15:18:12 +0300 Subject: [PATCH] prefix private vars in Disposables --- RxSwift/Disposables/AnonymousDisposable.swift | 8 +++--- RxSwift/Disposables/BinaryDisposable.swift | 16 ++++++------ RxSwift/Disposables/CompositeDisposable.swift | 26 +++++++++---------- RxSwift/Disposables/ScopedDisposable.swift | 8 +++--- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/RxSwift/Disposables/AnonymousDisposable.swift b/RxSwift/Disposables/AnonymousDisposable.swift index 0b9bbe4b..dffdd30d 100644 --- a/RxSwift/Disposables/AnonymousDisposable.swift +++ b/RxSwift/Disposables/AnonymousDisposable.swift @@ -17,7 +17,7 @@ public final class AnonymousDisposable : DisposeBase, Cancelable { public typealias DisposeAction = () -> Void private var _disposed: Int32 = 0 - private var disposeAction: DisposeAction? + private var _disposeAction: DisposeAction? /** - returns: Was resource disposed. @@ -34,7 +34,7 @@ public final class AnonymousDisposable : DisposeBase, Cancelable { - parameter disposeAction: Disposal action which will be run upon calling `dispose`. */ public init(_ disposeAction: DisposeAction) { - self.disposeAction = disposeAction + _disposeAction = disposeAction super.init() } @@ -45,8 +45,8 @@ public final class AnonymousDisposable : DisposeBase, Cancelable { */ public func dispose() { if OSAtomicCompareAndSwap32(0, 1, &_disposed) { - if let action = self.disposeAction { - self.disposeAction = nil + if let action = _disposeAction { + _disposeAction = nil action() } } diff --git a/RxSwift/Disposables/BinaryDisposable.swift b/RxSwift/Disposables/BinaryDisposable.swift index b4417350..35a4d941 100644 --- a/RxSwift/Disposables/BinaryDisposable.swift +++ b/RxSwift/Disposables/BinaryDisposable.swift @@ -16,8 +16,8 @@ public final class BinaryDisposable : DisposeBase, Cancelable { private var _disposed: Int32 = 0 // state - private var disposable1: Disposable? - private var disposable2: Disposable? + private var _disposable1: Disposable? + private var _disposable2: Disposable? /** - returns: Was resource disposed. @@ -35,8 +35,8 @@ public final class BinaryDisposable : DisposeBase, Cancelable { - parameter disposable2: Second disposable */ init(_ disposable1: Disposable, _ disposable2: Disposable) { - self.disposable1 = disposable1 - self.disposable2 = disposable2 + _disposable1 = disposable1 + _disposable2 = disposable2 super.init() } @@ -47,10 +47,10 @@ public final class BinaryDisposable : DisposeBase, Cancelable { */ public func dispose() { if OSAtomicCompareAndSwap32(0, 1, &_disposed) { - disposable1?.dispose() - disposable2?.dispose() - disposable1 = nil - disposable2 = nil + _disposable1?.dispose() + _disposable2?.dispose() + _disposable1 = nil + _disposable2 = nil } } } \ No newline at end of file diff --git a/RxSwift/Disposables/CompositeDisposable.swift b/RxSwift/Disposables/CompositeDisposable.swift index ac772c13..c49bad3c 100644 --- a/RxSwift/Disposables/CompositeDisposable.swift +++ b/RxSwift/Disposables/CompositeDisposable.swift @@ -17,12 +17,12 @@ public class CompositeDisposable : DisposeBase, Disposable, Cancelable { private var _lock = SpinLock() // state - private var disposables: Bag? = Bag() + private var _disposables: Bag? = Bag() public var disposed: Bool { get { return _lock.calculateLocked { - return disposables == nil + return _disposables == nil } } } @@ -34,17 +34,17 @@ public class CompositeDisposable : DisposeBase, Disposable, Cancelable { Initializes a new instance of composite disposable with the specified number of disposables. */ public init(_ disposable1: Disposable, _ disposable2: Disposable) { - disposables!.insert(disposable1) - disposables!.insert(disposable2) + _disposables!.insert(disposable1) + _disposables!.insert(disposable2) } /** Initializes a new instance of composite disposable with the specified number of disposables. */ public init(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable) { - disposables!.insert(disposable1) - disposables!.insert(disposable2) - disposables!.insert(disposable3) + _disposables!.insert(disposable1) + _disposables!.insert(disposable2) + _disposables!.insert(disposable3) } /** @@ -52,7 +52,7 @@ public class CompositeDisposable : DisposeBase, Disposable, Cancelable { */ public init(disposables: [Disposable]) { for disposable in disposables { - self.disposables!.insert(disposable) + _disposables!.insert(disposable) } } @@ -67,7 +67,7 @@ public class CompositeDisposable : DisposeBase, Disposable, Cancelable { // this should be let // bucause of compiler bug it's var let key = _lock.calculateLocked { () -> DisposeKey? in - return disposables?.insert(disposable) + return _disposables?.insert(disposable) } if key == nil { @@ -83,7 +83,7 @@ public class CompositeDisposable : DisposeBase, Disposable, Cancelable { public var count: Int { get { return _lock.calculateLocked { - return disposables?.count ?? 0 + return _disposables?.count ?? 0 } } } @@ -95,7 +95,7 @@ public class CompositeDisposable : DisposeBase, Disposable, Cancelable { */ public func removeDisposable(disposeKey: DisposeKey) { let disposable = _lock.calculateLocked { () -> Disposable? in - return disposables?.removeKey(disposeKey) + return _disposables?.removeKey(disposeKey) } if let disposable = disposable { @@ -108,8 +108,8 @@ public class CompositeDisposable : DisposeBase, Disposable, Cancelable { */ public func dispose() { let oldDisposables = _lock.calculateLocked { () -> Bag? in - let disposeBag = disposables - self.disposables = nil + let disposeBag = _disposables + _disposables = nil return disposeBag } diff --git a/RxSwift/Disposables/ScopedDisposable.swift b/RxSwift/Disposables/ScopedDisposable.swift index d9d418a8..6c44b164 100644 --- a/RxSwift/Disposables/ScopedDisposable.swift +++ b/RxSwift/Disposables/ScopedDisposable.swift @@ -33,7 +33,7 @@ extension Disposable { This returns ARC (RAII) like resource management to `RxSwift`. */ public class ScopedDisposable : DisposeBase { - private var disposable: Disposable? + private var _disposable: Disposable? /** Initializes new instance with a single disposable. @@ -41,17 +41,17 @@ public class ScopedDisposable : DisposeBase { - parameter disposable: `Disposable` that will be disposed on scope exit. */ public init(disposable: Disposable) { - self.disposable = disposable + _disposable = disposable } /** This is intentionally private. */ func dispose() { - self.disposable?.dispose() + _disposable?.dispose() } deinit { - self.dispose() + dispose() } } \ No newline at end of file