Skip to content

Commit bd1e72b

Browse files
M0rtyMerrfreak4pc
authored andcommitted
Reduce one character generics usage
1 parent 17fd181 commit bd1e72b

File tree

9 files changed

+13
-12
lines changed

9 files changed

+13
-12
lines changed

Source/RxCocoa/mapTo+RxCocoa.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ extension SharedSequenceConvertibleType {
1515
- parameter value: A constant that each element of the input sequence is being replaced with
1616
- returns: An unit containing the values `value` provided as a parameter
1717
*/
18-
public func mapTo<R>(_ value: R) -> SharedSequence<SharingStrategy, R> {
18+
public func mapTo<Result>(_ value: Result) -> SharedSequence<SharingStrategy, Result> {
1919
return map { _ in value }
2020
}
2121

2222
@available(*, deprecated, renamed: "mapTo(_:)")
23-
public func map<R>(to value: R) -> SharedSequence<SharingStrategy, R> {
23+
public func map<Result>(to value: Result) -> SharedSequence<SharingStrategy, Result> {
2424
return map { _ in value }
2525
}
2626
}

Source/RxCocoa/unwrap+SharedSequence.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extension SharedSequence {
1616
- returns: A SharedSequence of non-optional elements
1717
*/
1818

19-
public func unwrap<T>() -> SharedSequence<SharingStrategy, T> where Element == T? {
19+
public func unwrap<Result>() -> SharedSequence<SharingStrategy, Result> where Element == Result? {
2020
return self.filter { $0 != nil }.map { $0! }
2121
}
2222
}

Source/RxSwift/and.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ extension ObservableType where Element == Bool {
5151

5252
Use `asSingle()` or `asObservable()` to convert to your requirements.
5353
*/
54-
public static func and<C: Collection>(_ collection: C) -> Maybe<Element> where C.Element: ObservableType, C.Element.Element == Element {
54+
public static func and<Collection: Swift.Collection>(_ collection: Collection)
55+
-> Maybe<Element> where Collection.Element: ObservableType, Collection.Element.Element == Element {
5556
return Maybe.create { observer in
5657
var emitted = [Bool](repeating: false, count: Int(collection.count))
5758
var completed = 0
@@ -99,7 +100,7 @@ extension ObservableType where Element == Bool {
99100

100101
Use `asSingle()` or `asObservable()` to convert to your requirements.
101102
*/
102-
public static func and<O: ObservableType>(_ sources: O ...) -> Maybe<Element> where O.Element == Element {
103+
public static func and<Observable: ObservableType>(_ sources: Observable ...) -> Maybe<Element> where Observable.Element == Element {
103104
return and(sources)
104105
}
105106
}

Source/RxSwift/cascade.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extension Observable where Element: ObservableType {
2020
- parameter observables: a sequence of observables which will all be immediately subscribed to
2121
- returns: An observable sequence that contains elements from the latest observable sequence that emitted elements
2222
*/
23-
public static func cascade<S: Sequence>(_ observables: S) -> Observable<Element.Element> where S.Element == Element {
23+
public static func cascade<Sequebce: Swift.Sequence>(_ observables: Sequebce) -> Observable<Element.Element> where Sequebce.Element == Element {
2424
let flow = Array(observables)
2525
if flow.isEmpty {
2626
return Observable<Element.Element>.empty()

Source/RxSwift/ofType.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ extension ObservableType {
1919
- parameter type: The Type to filter each source element.
2020
- returns: An observable sequence that contains elements which is an instance of the suppplied type.
2121
*/
22-
public func ofType<T>(_ type: T.Type) -> Observable<T> {
22+
public func ofType<Result>(_ type: Result.Type) -> Observable<Result> {
2323
return self.filterMap {
24-
guard let result = $0 as? T else { return .ignore }
24+
guard let result = $0 as? Result else { return .ignore }
2525
return .map(result)
2626
}
2727
}

Source/RxSwift/pausable.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extension ObservableType {
2121
- returns: The observable sequence which is paused based upon the pauser observable sequence.
2222
*/
2323

24-
public func pausable<P: ObservableType> (_ pauser: P) -> Observable<Element> where P.Element == Bool {
24+
public func pausable<Pauser: ObservableType> (_ pauser: Pauser) -> Observable<Element> where Pauser.Element == Bool {
2525
return withLatestFrom(pauser) { element, paused in
2626
(element, paused)
2727
}

Source/RxSwift/pausableBuffered.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extension ObservableType {
2626
- parameter flushOnError: If `true` buffered elements will be flushed when the source errors. Default `true`.
2727
- returns: The observable sequence which is paused and resumed based upon the pauser observable sequence.
2828
*/
29-
public func pausableBuffered<P: ObservableType> (_ pauser: P, limit: Int? = 1, flushOnCompleted: Bool = true, flushOnError: Bool = true) -> Observable<Element> where P.Element == Bool {
29+
public func pausableBuffered<Pauser: ObservableType> (_ pauser: Pauser, limit: Int? = 1, flushOnCompleted: Bool = true, flushOnError: Bool = true) -> Observable<Element> where Pauser.Element == Bool {
3030

3131
return Observable<Element>.create { observer in
3232
var buffer: [Element] = []

Source/RxSwift/unwrap.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extension ObservableType {
1717
- returns: An observable sequence of non-optional elements
1818
*/
1919

20-
public func unwrap<T>() -> Observable<T> where Element == T? {
20+
public func unwrap<Result>() -> Observable<Result> where Element == Result? {
2121
return self.compactMap { $0 }
2222
}
2323
}

Source/RxSwift/zipWith.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extension ObservableConvertibleType {
2121

2222
- Returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
2323
*/
24-
public func zip<O2, ResultType>(with second: O2, resultSelector: @escaping (Element, O2.Element) throws -> ResultType) -> Observable<ResultType> where O2: ObservableConvertibleType {
24+
public func zip<Observable2: ObservableConvertibleType, ResultType>(with second: Observable2, resultSelector: @escaping (Element, Observable2.Element) throws -> ResultType) -> Observable<ResultType> {
2525
return Observable.zip(asObservable(), second.asObservable(), resultSelector: resultSelector)
2626
}
2727
}

0 commit comments

Comments
 (0)