Skip to content

Commit 6e336c1

Browse files
M0rtyMerrfreak4pc
authored andcommitted
Reduce one character generics usage
1 parent bd1e72b commit 6e336c1

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

Source/RxSwift/ObservableType+Weak.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ extension ObservableType {
1616
- parameter obj: The object that owns the function
1717
- parameter method: The instance function represented as `InstanceType.instanceFunc`
1818
*/
19-
fileprivate func weakify<A: AnyObject, B>(_ obj: A, method: ((A) -> (B) -> Void)?) -> ((B) -> Void) {
19+
fileprivate func weakify<Object: AnyObject, Input>(_ obj: Object, method: ((Object) -> (Input) -> Void)?) -> ((Input) -> Void) {
2020
return { [weak obj] value in
2121
guard let obj = obj else { return }
2222
method?(obj)(value)
2323
}
2424
}
2525

26-
fileprivate func weakify<A: AnyObject>(_ obj: A, method: ((A) -> () -> Void)?) -> (() -> Void) {
26+
fileprivate func weakify<Object: AnyObject>(_ obj: Object, method: ((Object) -> () -> Void)?) -> (() -> Void) {
2727
return { [weak obj] in
2828
guard let obj = obj else { return }
2929
method?(obj)()
@@ -37,7 +37,7 @@ extension ObservableType {
3737
- parameter on: Function to invoke on `weak` for each event in the observable sequence.
3838
- returns: Subscription object used to unsubscribe from the observable sequence.
3939
*/
40-
public func subscribe<A: AnyObject>(weak obj: A, _ on: @escaping (A) -> (Event<Element>) -> Void) -> Disposable {
40+
public func subscribe<Object: AnyObject>(weak obj: Object, _ on: @escaping (Object) -> (Event<Element>) -> Void) -> Disposable {
4141
return self.subscribe(weakify(obj, method: on))
4242
}
4343

@@ -52,13 +52,13 @@ extension ObservableType {
5252
gracefully completed, errored, or if the generation is cancelled by disposing subscription)
5353
- returns: Subscription object used to unsubscribe from the observable sequence.
5454
*/
55-
public func subscribe<A: AnyObject>(
56-
weak obj: A,
57-
onNext: ((A) -> (Element) -> Void)? = nil,
58-
onError: ((A) -> (Error) -> Void)? = nil,
59-
onCompleted: ((A) -> () -> Void)? = nil,
60-
onDisposed: ((A) -> () -> Void)? = nil)
61-
-> Disposable {
55+
public func subscribe<Object: AnyObject>(
56+
weak obj: Object,
57+
onNext: ((Object) -> (Element) -> Void)? = nil,
58+
onError: ((Object) -> (Error) -> Void)? = nil,
59+
onCompleted: ((Object) -> () -> Void)? = nil,
60+
onDisposed: ((Object) -> () -> Void)? = nil
61+
) -> Disposable {
6262
let disposable: Disposable
6363

6464
if let disposed = onDisposed {
@@ -91,7 +91,7 @@ extension ObservableType {
9191
- parameter onNext: Function to invoke on `weak` for each element in the observable sequence.
9292
- returns: Subscription object used to unsubscribe from the observable sequence.
9393
*/
94-
public func subscribeNext<A: AnyObject>(weak obj: A, _ onNext: @escaping (A) -> (Element) -> Void) -> Disposable {
94+
public func subscribeNext<Object: AnyObject>(weak obj: Object, _ onNext: @escaping (Object) -> (Element) -> Void) -> Disposable {
9595
return self.subscribe(onNext: weakify(obj, method: onNext))
9696
}
9797

@@ -102,7 +102,7 @@ extension ObservableType {
102102
- parameter onError: Function to invoke on `weak` upon errored termination of the observable sequence.
103103
- returns: Subscription object used to unsubscribe from the observable sequence.
104104
*/
105-
public func subscribeError<A: AnyObject>(weak obj: A, _ onError: @escaping (A) -> (Error) -> Void) -> Disposable {
105+
public func subscribeError<Object: AnyObject>(weak obj: Object, _ onError: @escaping (Object) -> (Error) -> Void) -> Disposable {
106106
return self.subscribe(onError: weakify(obj, method: onError))
107107
}
108108

@@ -113,7 +113,7 @@ extension ObservableType {
113113
- parameter onCompleted: Function to invoke on `weak` graceful termination of the observable sequence.
114114
- returns: Subscription object used to unsubscribe from the observable sequence.
115115
*/
116-
public func subscribeCompleted<A: AnyObject>(weak obj: A, _ onCompleted: @escaping (A) -> () -> Void) -> Disposable {
116+
public func subscribeCompleted<Object: AnyObject>(weak obj: Object, _ onCompleted: @escaping (Object) -> () -> Void) -> Disposable {
117117
return self.subscribe(onCompleted: weakify(obj, method: onCompleted))
118118
}
119119
}

Source/RxSwift/bufferWithTrigger.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extension ObservableType {
1616
- parameter trigger: The observable sequence used to signal the emission of the buffered items.
1717
- returns: The buffered observable from elements of the source sequence.
1818
*/
19-
public func bufferWithTrigger<U>(_ trigger: Observable<U>) -> Observable<[Element]> {
19+
public func bufferWithTrigger<Trigger: ObservableType>(_ trigger: Trigger) -> Observable<[Element]> {
2020
return Observable.create { observer in
2121
var buffer: [Element] = []
2222
let lock = NSRecursiveLock()

Source/RxSwift/withUnretained.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ extension ObservableType {
1717
- parameter resultSelector: A function to combine the unretained referenced on `obj` and the value of the observable sequence.
1818
- returns: An observable sequence that contains the result of `resultSelector` being called with an unretained reference on `obj` and the values of the original sequence.
1919
*/
20-
public func withUnretained<T: AnyObject, Out>(_ obj: T,
21-
resultSelector: @escaping ((T, Element)) -> Out) -> Observable<Out> {
20+
public func withUnretained<Object: AnyObject, Out>(_ obj: Object,
21+
resultSelector: @escaping ((Object, Element)) -> Out) -> Observable<Out> {
2222
return map { [weak obj] element -> Out in
2323
guard let obj = obj else { throw UnretainedError.failedRetaining }
2424

@@ -41,7 +41,7 @@ extension ObservableType {
4141
- parameter obj: The object to provide an unretained reference on.
4242
- returns: An observable sequence of tuples that contains both an unretained reference on `obj` and the values of the original sequence.
4343
*/
44-
public func withUnretained<T: AnyObject>(_ obj: T) -> Observable<(T, Element)> {
44+
public func withUnretained<Object: AnyObject>(_ obj: Object) -> Observable<(Object, Element)> {
4545
return withUnretained(obj) { ($0, $1) }
4646
}
4747
}

0 commit comments

Comments
 (0)