RxSwiftExt 5.0.0: RxSwift

Author: freak4pc

Source/RxSwift/ObservableType+Weak.swift

@@ -37,7 +37,7 @@ extension ObservableType {
 	- parameter on: Function to invoke on `weak` for each event in the observable sequence.
 	- returns: Subscription object used to unsubscribe from the observable sequence.
 	*/
-	public func subscribe<A: AnyObject>(weak obj: A, _ on: @escaping (A) -> (RxSwift.Event<Self.E>) -> Void) -> Disposable {
+	public func subscribe<A: AnyObject>(weak obj: A, _ on: @escaping (A) -> (Event<Element>) -> Void) -> Disposable {
 		return self.subscribe(weakify(obj, method: on))
 	}
 
@@ -54,7 +54,7 @@ extension ObservableType {
 	*/
 	public func subscribe<A: AnyObject>(
                     weak obj: A,
-                    onNext: ((A) -> (Self.E) -> Void)? = nil,
+                    onNext: ((A) -> (Element) -> Void)? = nil,
                     onError: ((A) -> (Error) -> Void)? = nil,
                     onCompleted: ((A) -> () -> Void)? = nil,
                     onDisposed: ((A) -> () -> Void)? = nil)
@@ -67,7 +67,7 @@ extension ObservableType {
 			disposable = Disposables.create()
 		}
 
-		let observer = AnyObserver { [weak obj] (e: RxSwift.Event<Self.E>) in
+		let observer = AnyObserver { [weak obj] (e: Event<Element>) in
 			guard let obj = obj else { return }
 			switch e {
 			case .next(let value):
@@ -91,7 +91,7 @@ extension ObservableType {
 	- parameter onNext: Function to invoke on `weak` for each element in the observable sequence.
 	- returns: Subscription object used to unsubscribe from the observable sequence.
 	*/
-	public func subscribeNext<A: AnyObject>(weak obj: A, _ onNext: @escaping (A) -> (Self.E) -> Void) -> Disposable {
+	public func subscribeNext<A: AnyObject>(weak obj: A, _ onNext: @escaping (A) -> (Element) -> Void) -> Disposable {
         return self.subscribe(onNext: weakify(obj, method: onNext))
 	}
 

Source/RxSwift/and.swift

@@ -9,7 +9,7 @@
 import Foundation
 import RxSwift
 
-extension ObservableType where E == Bool {
+extension ObservableType where Element == Bool {
 	/**
 	Emits a single Bool value indicating whether or not a Bool sequence emits only `true` values.
 
@@ -20,7 +20,7 @@ extension ObservableType where E == Bool {
 
 	Use `asSingle()` or `asObservable()` to convert to your requirements.
 	*/
-	public func and() -> Maybe<E> {
+	public func and() -> Maybe<Element> {
 		return Maybe.create { observer in
 			var gotValue = false
 			return self.subscribe { event in
@@ -51,7 +51,7 @@ extension ObservableType where E == Bool {
 
 	Use `asSingle()` or `asObservable()` to convert to your requirements.
 	*/
-	public static func and<C: Collection>(_ collection: C) -> Maybe<E> where C.Element: ObservableType, C.Element.E == E {
+	public static func and<C: Collection>(_ collection: C) -> Maybe<Element> where C.Element: ObservableType, C.Element.Element == Element {
 		return Maybe.create { observer in
 			var emitted = [Bool](repeating: false, count: Int(collection.count))
 			var completed = 0
@@ -99,7 +99,7 @@ extension ObservableType where E == Bool {
 
 	Use `asSingle()` or `asObservable()` to convert to your requirements.
 	*/
-	public static func and<O: ObservableType>(_ sources: O ...) -> Maybe<E> where O.E == E {
+	public static func and<O: ObservableType>(_ sources: O ...) -> Maybe<Element> where O.Element == Element {
 		return and(sources)
 	}
 }

Source/RxSwift/apply.swift

@@ -11,14 +11,14 @@ import RxSwift
 
 extension ObservableType {
     /// Apply a transformation function to the Observable.
-    public func apply<T>(_ transform: (Observable<Self.E>) -> Observable<T>) -> Observable<T> {
+    public func apply<Result>(_ transform: (Observable<Element>) -> Observable<Result>) -> Observable<Result> {
         return transform(self.asObservable())
     }
 }
 
-extension PrimitiveSequenceType where TraitType == SingleTrait {
+extension PrimitiveSequenceType where Trait == SingleTrait {
     /// Apply a transformation function to the Single.
-    public func apply<T>(_ transform: (Single<Self.ElementType>) -> Single<T>) -> Single<T> {
+    public func apply<T>(_ transform: (Single<Element>) -> Single<T>) -> Single<T> {
         return transform(self.primitiveSequence)
     }
 }

Source/RxSwift/bufferWithTrigger.swift

@@ -1,9 +1,9 @@
 //
 //  bufferWithTrigger.swift
-//  RxSwiftExt-iOS
+//  RxSwiftExt
 //
 //  Created by Patrick Maltagliati on 11/12/18.
-//  Copyright © 2018 RxSwiftCommunity. All rights reserved.
+//  Copyright © 2018 RxSwift Community. All rights reserved.
 //
 
 import Foundation
@@ -16,9 +16,9 @@ extension ObservableType {
      - parameter trigger: The observable sequence used to signal the emission of the buffered items.
      - returns: The buffered observable from elements of the source sequence.
      */
-    public func bufferWithTrigger<U>(_ trigger: Observable<U>) -> Observable<[E]> {
-        return Observable<[E]>.create { observer in
-            var buffer: [E] = []
+    public func bufferWithTrigger<U>(_ trigger: Observable<U>) -> Observable<[Element]> {
+        return Observable.create { observer in
+            var buffer: [Element] = []
             let lock = NSRecursiveLock()
             let triggerDisposable = trigger.subscribe { event in
                 lock.lock(); defer { lock.unlock() }

Source/RxSwift/cascade.swift

@@ -10,9 +10,6 @@ import Foundation
 import RxSwift
 
 extension Observable where Element: ObservableType {
-
-	public typealias T = Element.E
-
 	/**
 	Cascade through a sequence of observables: every observable that sends a `next` value becomes the "current"
 	observable (like in `switchLatest`), and the subscription to all previous observables in the sequence is disposed.
@@ -23,13 +20,13 @@ extension Observable where Element: ObservableType {
 	- parameter observables: a sequence of observables which will all be immediately subscribed to
 	- returns: An observable sequence that contains elements from the latest observable sequence that emitted elements
 	*/
-	public static func cascade<S: Sequence>(_ observables: S) -> Observable<T> where S.Iterator.Element == Element {
+	public static func cascade<S: Sequence>(_ observables: S) -> Observable<Element.Element> where S.Element == Element {
         let flow = Array(observables)
         if flow.isEmpty {
-            return Observable<T>.empty()
+            return Observable<Element.Element>.empty()
         }
 
-        return Observable<T>.create { observer in
+        return Observable<Element.Element>.create { observer in
             var current = 0, initialized = false
             var subscriptions: [SerialDisposable?] = flow.map { _ in SerialDisposable() }
 
@@ -104,7 +101,7 @@ extension ObservableType {
     - parameter observables: a sequence of observables which will all be immediately subscribed to
     - returns: An observable sequence that contains elements from the latest observable sequence that emitted elements
     */
-    public func cascade<S: Sequence>(_ next: S) -> Observable<E> where S.Iterator.Element == Self {
+    public func cascade<S: Sequence>(_ next: S) -> Observable<Element> where S.Element == Self {
         return Observable.cascade([self.asObservable()] + Array(next).map { $0.asObservable() })
     }
 }

Source/RxSwift/catchErrorJustComplete.swift

@@ -14,7 +14,7 @@ extension ObservableType {
 
      - returns: An observable sequence that never errors and completes when an error occurs in the underlying sequence
      */
-    public func catchErrorJustComplete() -> Observable<E> {
+    public func catchErrorJustComplete() -> Observable<Element> {
         return catchError { _ in
             return Observable.empty()
         }

Source/RxSwift/count.swift

@@ -1,9 +1,9 @@
 //
 //  count.swift
-//  RxSwiftExt-iOS
+//  RxSwiftExt
 //
 //  Created by Fred on 06/11/2018.
-//  Copyright © 2018 RxSwiftCommunity. All rights reserved.
+//  Copyright © 2018 RxSwift Community. All rights reserved.
 //
 
 import Foundation

Source/RxSwift/distinct.swift

@@ -17,7 +17,7 @@ extension Observable {
 
      - returns: An observable sequence only containing the distinct contiguous elements, based on predicate, from the source sequence.
      */
-    public func distinct(_ predicate: @escaping (Element) throws -> Bool) -> Observable<E> {
+    public func distinct(_ predicate: @escaping (Element) throws -> Bool) -> Observable<Element> {
         var cache = [Element]()
         return flatMap { element -> Observable<Element> in
             if try cache.contains(where: predicate) {

Source/RxSwift/filterMap.swift

@@ -29,7 +29,7 @@ extension ObservableType {
         - returning `.ignore` will filter the value out of the returned Observable
         - returning `.map(newValue)` will propagate newValue through the returned Observable.
      */
-    public func filterMap<T>(_ transform: @escaping (E) -> FilterMap<T>) -> Observable<T> {
+    public func filterMap<Result>(_ transform: @escaping (Element) -> FilterMap<Result>) -> Observable<Result> {
         return flatMapSync { transform($0).asOperator }
     }
 }

Source/RxSwift/flatMapSync.swift

@@ -58,7 +58,7 @@ extension ObservableType {
 
      see filterMap for an example of a custom operator
      */
-    public func flatMapSync<O: CustomOperator>(_ transform: @escaping (E) -> O) -> Observable<O.Result> {
+    public func flatMapSync<O: CustomOperator>(_ transform: @escaping (Element) -> O) -> Observable<O.Result> {
         return Observable.create { observer in
             return self.subscribe { event in
                 switch event {