Skip to content

Commit d135121

Browse files
committed
merge(with:) array version
1 parent 6fcfaed commit d135121

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

Playground/RxSwiftExtPlayground.playground/Pages/mergeWith.xcplaygroundpage/Contents.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ example("merge(with:)") {
2727
let evenStream = Observable.from(evenNumbers)
2828
let otherStream = Observable.from(otherNumbers)
2929

30-
oddStream.merge(with: evenStream, otherStream)
30+
oddStream
31+
.merge(with: [evenStream, otherStream])
3132
.subscribe(onNext: { result in
3233
print(result)
3334
})

RxSwiftExt.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,9 @@
474474
9DAB77991D6763AC007E85BC /* Frameworks */,
475475
18EE7A191C47B12F00C7256C /* Products */,
476476
);
477+
indentWidth = 4;
477478
sourceTree = "<group>";
479+
tabWidth = 4;
478480
};
479481
18EE7A191C47B12F00C7256C /* Products */ = {
480482
isa = PBXGroup;

Source/RxSwift/mergeWith.swift

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,23 @@ import Foundation
1010
import RxSwift
1111

1212
extension Observable {
13+
/**
14+
Merges elements from the observable sequence with those of a different observable sequence into a single observable sequence.
15+
16+
- parameter with: Other observable.
17+
- returns: The observable sequence that merges the elements of the observable sequences.
18+
*/
19+
public func merge(with other: Observable<Element>) -> Observable<Element> {
20+
return Observable.merge(self, other)
21+
}
22+
1323
/**
1424
Merges elements from the observable sequence with those of a different observable sequences into a single observable sequence.
1525

1626
- parameter with: Other observables.
1727
- returns: The observable sequence that merges the elements of the observable sequences.
1828
*/
19-
public func merge(with others: Observable<Element>...) -> Observable<Element> {
29+
public func merge(with others: [Observable<Element>]) -> Observable<Element> {
2030
return Observable.merge([self] + others)
2131
}
2232
}

0 commit comments

Comments
 (0)