TouchInstinct
/
RxSwift
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace immutable initialisations of `CompositeDisposable` with `Disposables.create()`. 

The factory methods will select specialised implementations based on the case.
This commit is contained in:
Mo Ramezanpoor 2016-08-10 14:25:19 +01:00
parent 2df8c43077
commit 2812da1f5e
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RxCocoa/Common/DelegateProxyType.swift
View File

@ -273,6 +273,6 @@ extension ObservableType {
}
}
return CompositeDisposable(subscription, disposable)
return Disposables.create(subscription, disposable)
}
}

2
RxExample/RxExample-iOSTests/TestScheduler+MarbleTests.swift
View File

@ -156,7 +156,7 @@ extension TestScheduler {
attemptCount += 1
return CompositeDisposable(disposables: scheduledEvents)
return Disposables.create(scheduledEvents)
}
}

2
RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift
View File

@ -56,7 +56,7 @@ extension UIImagePickerController {
parent.present(imagePicker, animated: animated, completion: nil)
observer.on(.next(imagePicker))
return CompositeDisposable(dismissDisposable, AnonymousDisposable {
return Disposables.create(dismissDisposable, AnonymousDisposable {
dismissViewController(imagePicker, animated: animated)
})
}

2
RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift
View File

@ -100,7 +100,7 @@ class CombineLatestCollectionTypeSink<C: Collection, R, O: ObserverType where C.
j += 1
}
return CompositeDisposable(disposables: _subscriptions.map { $0 })
return Disposables.create(_subscriptions)
}
}

14
RxSwift/Observables/Implementations/CombineLatest+arity.swift
View File

@ -57,7 +57,7 @@ class CombineLatestSink2_<E1, E2, O: ObserverType> : CombineLatestSink<O> {
subscription1.disposable = _parent._source1.subscribe(observer1)
subscription2.disposable = _parent._source2.subscribe(observer2)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2
])
@ -142,7 +142,7 @@ class CombineLatestSink3_<E1, E2, E3, O: ObserverType> : CombineLatestSink<O> {
subscription2.disposable = _parent._source2.subscribe(observer2)
subscription3.disposable = _parent._source3.subscribe(observer3)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3
@ -234,7 +234,7 @@ class CombineLatestSink4_<E1, E2, E3, E4, O: ObserverType> : CombineLatestSink<O
subscription3.disposable = _parent._source3.subscribe(observer3)
subscription4.disposable = _parent._source4.subscribe(observer4)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,
@ -333,7 +333,7 @@ class CombineLatestSink5_<E1, E2, E3, E4, E5, O: ObserverType> : CombineLatestSi
subscription4.disposable = _parent._source4.subscribe(observer4)
subscription5.disposable = _parent._source5.subscribe(observer5)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,
@ -439,7 +439,7 @@ class CombineLatestSink6_<E1, E2, E3, E4, E5, E6, O: ObserverType> : CombineLate
subscription5.disposable = _parent._source5.subscribe(observer5)
subscription6.disposable = _parent._source6.subscribe(observer6)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,
@ -552,7 +552,7 @@ class CombineLatestSink7_<E1, E2, E3, E4, E5, E6, E7, O: ObserverType> : Combine
subscription6.disposable = _parent._source6.subscribe(observer6)
subscription7.disposable = _parent._source7.subscribe(observer7)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,
@ -672,7 +672,7 @@ class CombineLatestSink8_<E1, E2, E3, E4, E5, E6, E7, E8, O: ObserverType> : Com
subscription7.disposable = _parent._source7.subscribe(observer7)
subscription8.disposable = _parent._source8.subscribe(observer8)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,

2
RxSwift/Observables/Implementations/CombineLatest+arity.tt
View File

@ -60,7 +60,7 @@ class CombineLatestSink<%= i %>_<<%= (Array(1...i).map { "E\($0)" }).joined(sepa
" subscription\($0).disposable = _parent._source\($0).subscribe(observer\($0))"
}).joined(separator: "\n") %>
return CompositeDisposable(disposables: [
return Disposables.create([
<%= (Array(1...i).map { " subscription\($0)" }).joined(separator: ",\n") %>
])
}

2
RxSwift/Observables/Implementations/Zip+CollectionType.swift
View File

@ -112,7 +112,7 @@ class ZipCollectionTypeSink<C: Collection, R, O: ObserverType where C.Iterator.E
j += 1
}
return CompositeDisposable(disposables: _subscriptions.map { $0 })
return Disposables.create(_subscriptions)
}
}

14
RxSwift/Observables/Implementations/Zip+arity.swift
View File

@ -69,7 +69,7 @@ class ZipSink2_<E1, E2, O: ObserverType> : ZipSink<O> {
subscription1.disposable = _parent.source1.subscribe(observer1)
subscription2.disposable = _parent.source2.subscribe(observer2)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2
])
@ -167,7 +167,7 @@ class ZipSink3_<E1, E2, E3, O: ObserverType> : ZipSink<O> {
subscription2.disposable = _parent.source2.subscribe(observer2)
subscription3.disposable = _parent.source3.subscribe(observer3)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3
@ -273,7 +273,7 @@ class ZipSink4_<E1, E2, E3, E4, O: ObserverType> : ZipSink<O> {
subscription3.disposable = _parent.source3.subscribe(observer3)
subscription4.disposable = _parent.source4.subscribe(observer4)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,
@ -387,7 +387,7 @@ class ZipSink5_<E1, E2, E3, E4, E5, O: ObserverType> : ZipSink<O> {
subscription4.disposable = _parent.source4.subscribe(observer4)
subscription5.disposable = _parent.source5.subscribe(observer5)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,
@ -509,7 +509,7 @@ class ZipSink6_<E1, E2, E3, E4, E5, E6, O: ObserverType> : ZipSink<O> {
subscription5.disposable = _parent.source5.subscribe(observer5)
subscription6.disposable = _parent.source6.subscribe(observer6)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,
@ -639,7 +639,7 @@ class ZipSink7_<E1, E2, E3, E4, E5, E6, E7, O: ObserverType> : ZipSink<O> {
subscription6.disposable = _parent.source6.subscribe(observer6)
subscription7.disposable = _parent.source7.subscribe(observer7)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,
@ -777,7 +777,7 @@ class ZipSink8_<E1, E2, E3, E4, E5, E6, E7, E8, O: ObserverType> : ZipSink<O> {
subscription7.disposable = _parent.source7.subscribe(observer7)
subscription8.disposable = _parent.source8.subscribe(observer8)
return CompositeDisposable(disposables: [
return Disposables.create([
subscription1,
subscription2,
subscription3,

2
RxSwift/Observables/Implementations/Zip+arity.tt
View File

@ -72,7 +72,7 @@ class ZipSink<%= i %>_<<%= (Array(1...i).map { "E\($0)" }).joined(separator: ",
" subscription\($0).disposable = _parent.source\($0).subscribe(observer\($0))" }).joined(separator: "\n")
%>
return CompositeDisposable(disposables: [
return Disposables.create([
<%= (Array(1...i).map { " subscription\($0)" }).joined(separator: ",\n") %>
])
}