ReactiveX/RxSwift
1
1
Fork 0
mirror of https://github.com/ReactiveX/RxSwift.git synced 2024-10-05 06:27:29 +03:00
Code Issues Projects Releases Wiki Activity

RxCocoa & RxTest: Rename Element to ElementType

Browse Source
This commit is contained in:
freak4pc 2019-04-22 23:12:28 +03:00 committed by Krunoslav Zaher
parent e48fad5b39
commit 2b8c1a974c
6 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RxCocoa/Deprecated.swift
View File

@ -290,16 +290,16 @@ Observer that enforces interface binding rules:
queue.
*/
@available(*, deprecated, renamed: "Binder")
public final class UIBindingObserver<UIElementType, Value> : ObserverType where UIElementType: AnyObject {
public final class UIBindingObserver<UIElement, Value> : ObserverType where UIElement: AnyObject {
public typealias Element = Value
weak var UIElement: UIElementType?
weak var UIElement: UIElement?
let binding: (UIElementType, Value) -> Void
let binding: (UIElement, Value) -> Void
/// Initializes `ViewBindingObserver` using
@available(*, deprecated, renamed: "UIBinder.init(_:scheduler:binding:)")
public init(UIElement: UIElementType, binding: @escaping (UIElementType, Value) -> Void) {
public init(UIElement: UIElement, binding: @escaping (UIElement, Value) -> Void) {
self.UIElement = UIElement
self.binding = binding
}

4
RxTest/TestableObserver.swift
View File

@ -9,10 +9,8 @@
import RxSwift
/// Observer that records events together with virtual time when they were received.
public final class TestableObserver<ElementType>
public final class TestableObserver<Element>
: ObserverType {
public typealias Element = ElementType
fileprivate let _scheduler: TestScheduler
/// Recorded events.

2
Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift
View File

@ -10,7 +10,7 @@ import RxSwift
import XCTest
import Dispatch
final class BackgroundThreadPrimitiveHotObservable<ElementType: Equatable> : PrimitiveHotObservable<ElementType> {
final class BackgroundThreadPrimitiveHotObservable<Element: Equatable> : PrimitiveHotObservable<Element> {
override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element {
XCTAssertTrue(!DispatchQueue.isMain)
return super.subscribe(observer)

2
Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift
View File

@ -10,7 +10,7 @@ import RxSwift
import XCTest
import Dispatch
final class MainThreadPrimitiveHotObservable<ElementType: Equatable> : PrimitiveHotObservable<ElementType> {
final class MainThreadPrimitiveHotObservable<Element: Equatable> : PrimitiveHotObservable<Element> {
override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element {
XCTAssertTrue(DispatchQueue.isMain)
return super.subscribe(observer)

6
Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift
View File

@ -13,14 +13,12 @@ import Dispatch
let SubscribedToHotObservable = Subscription(0)
let UnsunscribedFromHotObservable = Subscription(0, 0)
class PrimitiveHotObservable<ElementType> : ObservableType {
typealias Element = ElementType
class PrimitiveHotObservable<Element> : ObservableType {
typealias Events = Recorded<Element>
typealias Observer = AnyObserver<Element>
var _subscriptions = [Subscription]()
let _observers = PublishSubject<ElementType>()
let _observers = PublishSubject<Element>()
public var subscriptions: [Subscription] {
lock.lock()

4
Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift
View File

@ -9,9 +9,7 @@
import RxSwift
import RxTest
final class PrimitiveMockObserver<ElementType> : ObserverType {
typealias Element = ElementType
final class PrimitiveMockObserver<Element> : ObserverType {
private let _events = Synchronized([Recorded<Event<Element>>]())
var events: [Recorded<Event<Element>>] {