mirror of
https://github.com/ReactiveX/RxSwift.git
synced 2024-10-05 06:27:29 +03:00
RxCocoa: Rename O to Observer when applicable
This commit is contained in:
parent
29705673bb
commit
de3ae8bbbe
@ -16,7 +16,7 @@ extension ObservableType {
|
||||
- parameter to: Observers to receives events.
|
||||
- returns: Disposable object that can be used to unsubscribe the observers.
|
||||
*/
|
||||
public func bind<O: ObserverType>(to observers: O...) -> Disposable where O.Element == Element {
|
||||
public func bind<Observer: ObserverType>(to observers: Observer...) -> Disposable where Observer.Element == Element {
|
||||
return self.bind(to: observers)
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@ extension ObservableType {
|
||||
- parameter to: Observers to receives events.
|
||||
- returns: Disposable object that can be used to unsubscribe the observers.
|
||||
*/
|
||||
public func bind<O: ObserverType>(to observers: O...) -> Disposable where O.Element == Element? {
|
||||
public func bind<Observer: ObserverType>(to observers: Observer...) -> Disposable where Observer.Element == Element? {
|
||||
return self.map { $0 as Element? }.bind(to: observers)
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ extension ObservableType {
|
||||
- parameter to: Observers to receives events.
|
||||
- returns: Disposable object that can be used to unsubscribe the observers.
|
||||
*/
|
||||
private func bind<O: ObserverType>(to observers: [O]) -> Disposable where O.Element == Element {
|
||||
private func bind<Observer: ObserverType>(to observers: [Observer]) -> Disposable where Observer.Element == Element {
|
||||
return self.subscribe { event in
|
||||
observers.forEach { $0.on(event) }
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ extension ObservableType {
|
||||
- returns: Disposable object that can be used to unsubscribe the observer.
|
||||
*/
|
||||
@available(*, deprecated, renamed: "bind(to:)")
|
||||
public func bindTo<O: ObserverType>(_ observer: O) -> Disposable where O.Element == Element {
|
||||
public func bindTo<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
|
||||
return self.subscribe(observer)
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ extension ObservableType {
|
||||
- returns: Disposable object that can be used to unsubscribe the observer.
|
||||
*/
|
||||
@available(*, deprecated, renamed: "bind(to:)")
|
||||
public func bindTo<O: ObserverType>(_ observer: O) -> Disposable where O.Element == Element? {
|
||||
public func bindTo<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element? {
|
||||
return self.map { $0 }.subscribe(observer)
|
||||
}
|
||||
|
||||
|
@ -383,7 +383,7 @@ fileprivate final class KVOObservable<Element>
|
||||
}
|
||||
}
|
||||
|
||||
func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.Element == Element? {
|
||||
func subscribe<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element? {
|
||||
let observer = KVOObserver(parent: self) { value in
|
||||
if value as? NSNull != nil {
|
||||
observer.on(.next(nil))
|
||||
|
@ -53,7 +53,7 @@ public struct ControlEvent<PropertyType> : ControlEventType {
|
||||
///
|
||||
/// - parameter observer: Observer to subscribe to events.
|
||||
/// - returns: Disposable object that can be used to unsubscribe the observer from receiving control events.
|
||||
public func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.Element == Element {
|
||||
public func subscribe<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
|
||||
return self._events.subscribe(observer)
|
||||
}
|
||||
|
||||
|
@ -62,7 +62,7 @@ public struct ControlProperty<PropertyType> : ControlPropertyType {
|
||||
///
|
||||
/// - parameter observer: Observer to subscribe to property values.
|
||||
/// - returns: Disposable object that can be used to unsubscribe the observer from receiving control property values.
|
||||
public func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.Element == Element {
|
||||
public func subscribe<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
|
||||
return self._values.subscribe(observer)
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingSt
|
||||
- parameter observer: Observer that receives events.
|
||||
- returns: Disposable object that can be used to unsubscribe the observer from the subject.
|
||||
*/
|
||||
public func drive<O: ObserverType>(_ observer: O) -> Disposable where O.Element == Element {
|
||||
public func drive<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
|
||||
MainScheduler.ensureRunningOnMainThread(errorMessage: errorMessage)
|
||||
return self.asSharedSequence().asObservable().subscribe(observer)
|
||||
}
|
||||
@ -36,7 +36,7 @@ extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingSt
|
||||
- parameter observer: Observer that receives events.
|
||||
- returns: Disposable object that can be used to unsubscribe the observer from the subject.
|
||||
*/
|
||||
public func drive<O: ObserverType>(_ observer: O) -> Disposable where O.Element == Element? {
|
||||
public func drive<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element? {
|
||||
MainScheduler.ensureRunningOnMainThread(errorMessage: errorMessage)
|
||||
return self.asSharedSequence().asObservable().map { $0 as Element? }.subscribe(observer)
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ extension SharedSequenceConvertibleType where SharingStrategy == SignalSharingSt
|
||||
- parameter to: Observer that receives events.
|
||||
- returns: Disposable object that can be used to unsubscribe the observer from the subject.
|
||||
*/
|
||||
public func emit<O: ObserverType>(to observer: O) -> Disposable where O.Element == Element {
|
||||
public func emit<Observer: ObserverType>(to observer: Observer) -> Disposable where Observer.Element == Element {
|
||||
return self.asSharedSequence().asObservable().subscribe(observer)
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ extension SharedSequenceConvertibleType where SharingStrategy == SignalSharingSt
|
||||
- parameter to: Observer that receives events.
|
||||
- returns: Disposable object that can be used to unsubscribe the observer from the subject.
|
||||
*/
|
||||
public func emit<O: ObserverType>(to observer: O) -> Disposable where O.Element == Element? {
|
||||
public func emit<Observer: ObserverType>(to observer: Observer) -> Disposable where Observer.Element == Element? {
|
||||
return self.asSharedSequence().asObservable().map { $0 as Element? }.subscribe(observer)
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user