Skip to content

Commit e81a59e

Browse files
kzaherkzaher
committed
Changes Observable extensions to ObservableType extensions.
1 parent f6b5624 commit e81a59e

24 files changed

+54
-54
lines changed

‎RxExample/RxExample/Observable+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import RxSwift
1010
import RxCocoa
1111

12-
extension Observable {
12+
extension ObservableType {
1313
/**
1414
Simulation of a discrete system with feedback loops.
1515
Interpretations:

‎RxSwift/Observables/Amb.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Propagates the observable sequence that reacts first.
1212

1313
- seealso: [amb operator on reactivex.io](http://reactivex.io/documentation/operators/amb.html)
1414

1515
- returns: An observable sequence that surfaces any of the given sequences, whichever reacted first.
1616
*/
17-
public static func amb<S: Sequence>(_ sequence: S) -> Observable<Element>
18-
where S.Iterator.Element == Observable<Element> {
17+
public static func amb<S: Sequence>(_ sequence: S) -> Observable<E>
18+
where S.Iterator.Element == Observable<E> {
1919
return sequence.reduce(Observable<S.Iterator.Element.E>.never()) { a, o in
2020
return a.amb(o.asObservable())
2121
}

‎RxSwift/Observables/Catch.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ extension ObservableType {
3636

3737
}
3838

39-
extension Observable {
39+
extension ObservableType {
4040
/**
4141
Continues an observable sequence that is terminated by an error with the next observable sequence.
4242

4343
- seealso: [catch operator on reactivex.io](http://reactivex.io/documentation/operators/catch.html)
4444

4545
- returns: An observable sequence containing elements from consecutive source sequences until a source sequence terminates successfully.
4646
*/
47-
public static func catchError<S: Sequence>(_ sequence: S) -> Observable<Element>
48-
where S.Iterator.Element == Observable<Element> {
47+
public static func catchError<S: Sequence>(_ sequence: S) -> Observable<E>
48+
where S.Iterator.Element == Observable<E> {
4949
return CatchSequence(sources: sequence)
5050
}
5151
}
@@ -77,7 +77,7 @@ extension ObservableType {
7777
*/
7878
public func retry(_ maxAttemptCount: Int)
7979
-> Observable<E> {
80-
return CatchSequence(sources: repeatElement(self.asObservable(), count: maxAttemptCount))
80+
return CatchSequence(sources: Swift.repeatElement(self.asObservable(), count: maxAttemptCount))
8181
}
8282
}
8383

‎RxSwift/Observables/CombineLatest+Collection.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
1212

@@ -15,7 +15,7 @@ extension Observable {
1515
- parameter resultSelector: Function to invoke whenever any of the sources produces an element.
1616
- returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
1717
*/
18-
public static func combineLatest<C: Collection>(_ collection: C, _ resultSelector: @escaping ([C.Iterator.Element.E]) throws -> Element) -> Observable<Element>
18+
public static func combineLatest<C: Collection>(_ collection: C, _ resultSelector: @escaping ([C.Iterator.Element.E]) throws -> E) -> Observable<E>
1919
where C.Iterator.Element: ObservableType {
2020
return CombineLatestCollectionType(sources: collection, resultSelector: resultSelector)
2121
}
@@ -27,8 +27,8 @@ extension Observable {
2727

2828
- returns: An observable sequence containing the result of combining elements of the sources.
2929
*/
30-
public static func combineLatest<C: Collection>(_ collection: C) -> Observable<[Element]>
31-
where C.Iterator.Element: ObservableType, C.Iterator.Element.E == Element {
30+
public static func combineLatest<C: Collection>(_ collection: C) -> Observable<[E]>
31+
where C.Iterator.Element: ObservableType, C.Iterator.Element.E == E {
3232
return CombineLatestCollectionType(sources: collection, resultSelector: { $0 })
3333
}
3434
}

‎RxSwift/Observables/CombineLatest+arity.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
// 2
1313

14-
extension Observable {
14+
extension ObservableType {
1515
/**
1616
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
1717

@@ -109,7 +109,7 @@ final class CombineLatest2<E1, E2, R> : Producer<R> {
109109

110110
// 3
111111

112-
extension Observable {
112+
extension ObservableType {
113113
/**
114114
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
115115

@@ -214,7 +214,7 @@ final class CombineLatest3<E1, E2, E3, R> : Producer<R> {
214214

215215
// 4
216216

217-
extension Observable {
217+
extension ObservableType {
218218
/**
219219
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
220220

@@ -326,7 +326,7 @@ final class CombineLatest4<E1, E2, E3, E4, R> : Producer<R> {
326326

327327
// 5
328328

329-
extension Observable {
329+
extension ObservableType {
330330
/**
331331
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
332332

@@ -445,7 +445,7 @@ final class CombineLatest5<E1, E2, E3, E4, E5, R> : Producer<R> {
445445

446446
// 6
447447

448-
extension Observable {
448+
extension ObservableType {
449449
/**
450450
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
451451

@@ -571,7 +571,7 @@ final class CombineLatest6<E1, E2, E3, E4, E5, E6, R> : Producer<R> {
571571

572572
// 7
573573

574-
extension Observable {
574+
extension ObservableType {
575575
/**
576576
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
577577

@@ -704,7 +704,7 @@ final class CombineLatest7<E1, E2, E3, E4, E5, E6, E7, R> : Producer<R> {
704704

705705
// 8
706706

707-
extension Observable {
707+
extension ObservableType {
708708
/**
709709
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
710710

‎RxSwift/Observables/CombineLatest+arity.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// <%= i %>
1212

13-
extension Observable {
13+
extension ObservableType {
1414
/**
1515
Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
1616

‎RxSwift/Observables/Concat.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extension ObservableType {
2121
}
2222
}
2323

24-
extension Observable {
24+
extension ObservableType {
2525
/**
2626
Concatenates all observable sequences in the given sequence, as long as the previous observable sequence terminated successfully.
2727

@@ -35,8 +35,8 @@ extension Observable {
3535

3636
- returns: An observable sequence that contains the elements of each given sequence, in sequential order.
3737
*/
38-
public static func concat<S: Sequence >(_ sequence: S) -> Observable<Element>
39-
where S.Iterator.Element == Observable<Element> {
38+
public static func concat<S: Sequence >(_ sequence: S) -> Observable<E>
39+
where S.Iterator.Element == Observable<E> {
4040
return Concat(sources: sequence, count: nil)
4141
}
4242

@@ -53,8 +53,8 @@ extension Observable {
5353

5454
- returns: An observable sequence that contains the elements of each given sequence, in sequential order.
5555
*/
56-
public static func concat<S: Collection >(_ collection: S) -> Observable<Element>
57-
where S.Iterator.Element == Observable<Element> {
56+
public static func concat<S: Collection >(_ collection: S) -> Observable<E>
57+
where S.Iterator.Element == Observable<E> {
5858
return Concat(sources: collection, count: Int64(collection.count))
5959
}
6060

@@ -71,7 +71,7 @@ extension Observable {
7171

7272
- returns: An observable sequence that contains the elements of each given sequence, in sequential order.
7373
*/
74-
public static func concat(_ sources: Observable<Element> ...) -> Observable<Element> {
74+
public static func concat(_ sources: Observable<E> ...) -> Observable<E> {
7575
return Concat(sources: sources, count: Int64(sources.count))
7676
}
7777
}

‎RxSwift/Observables/Create.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
// MARK: create
1111

1212
/**

‎RxSwift/Observables/Deferred.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Returns an observable sequence that invokes the specified factory function whenever a new observer subscribes.
1212

‎RxSwift/Observables/Empty.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Returns an empty observable sequence, using the specified scheduler to send out the single `Completed` message.
1212

‎RxSwift/Observables/Error.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Returns an observable sequence that terminates with an `error`.
1212

‎RxSwift/Observables/Generate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Generates an observable sequence by running a state-driven loop producing the sequence's elements, using the specified scheduler
1212
to run the loop send out observer messages.

‎RxSwift/Observables/Just.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Returns an observable sequence that contains a single element.
1212

‎RxSwift/Observables/Merge.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ extension ObservableType where E : ObservableConvertibleType {
8181
}
8282
}
8383

84-
extension Observable {
84+
extension ObservableType {
8585
/**
8686
Merges elements from all observable sequences from collection into a single observable sequence.
8787

‎RxSwift/Observables/Never.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010

1111
/**
1212
Returns a non-terminating observable sequence, which can be used to denote an infinite duration.

‎RxSwift/Observables/Optional.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2016 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Converts a optional to an observable sequence.
1212

‎RxSwift/Observables/Range.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable where Element : RxAbstractInteger {
9+
extension ObservableType where E : RxAbstractInteger {
1010
/**
1111
Generates an observable sequence of integral numbers within a specified range, using the specified scheduler to generate and send out observer messages.
1212

‎RxSwift/Observables/Repeat.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Generates an observable sequence that repeats the given element infinitely, using the specified scheduler to send out observer messages.
1212

‎RxSwift/Observables/Sequence.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
// MARK: of
1111

1212
/**
@@ -23,7 +23,7 @@ extension Observable {
2323
}
2424
}
2525

26-
extension Observable {
26+
extension ObservableType {
2727
/**
2828
Converts an array to an observable sequence.
2929

‎RxSwift/Observables/Timer.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable where Element : RxAbstractInteger {
9+
extension ObservableType where E : RxAbstractInteger {
1010
/**
1111
Returns an observable sequence that produces a value after each period, using the specified scheduler to run timers and to send out observer messages.
1212

@@ -25,7 +25,7 @@ extension Observable where Element : RxAbstractInteger {
2525
}
2626
}
2727

28-
extension Observable where Element: RxAbstractInteger {
28+
extension ObservableType where E: RxAbstractInteger {
2929
/**
3030
Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
3131

‎RxSwift/Observables/Using.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Constructs an observable sequence that depends on a resource object, whose lifetime is tied to the resulting observable sequence's lifetime.
1212

‎RxSwift/Observables/Zip+Collection.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
extension Observable {
9+
extension ObservableType {
1010
/**
1111
Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
1212

@@ -15,7 +15,7 @@ extension Observable {
1515
- parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
1616
- returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
1717
*/
18-
public static func zip<C: Collection>(_ collection: C, _ resultSelector: @escaping ([C.Iterator.Element.E]) throws -> Element) -> Observable<Element>
18+
public static func zip<C: Collection>(_ collection: C, _ resultSelector: @escaping ([C.Iterator.Element.E]) throws -> E) -> Observable<E>
1919
where C.Iterator.Element: ObservableType {
2020
return ZipCollectionType(sources: collection, resultSelector: resultSelector)
2121
}
@@ -27,8 +27,8 @@ extension Observable {
2727

2828
- returns: An observable sequence containing the result of combining elements of the sources.
2929
*/
30-
public static func zip<C: Collection>(_ collection: C) -> Observable<[Element]>
31-
where C.Iterator.Element: ObservableType, C.Iterator.Element.E == Element {
30+
public static func zip<C: Collection>(_ collection: C) -> Observable<[E]>
31+
where C.Iterator.Element: ObservableType, C.Iterator.Element.E == E {
3232
return ZipCollectionType(sources: collection, resultSelector: { $0 })
3333
}
3434

0 commit comments

Comments
 (0)