Skip to content

Commit c0906f9

Browse files
thomasnieldthomasnield
committed
rename combineFunction to combiner
1 parent 29eae30 commit c0906f9

File tree

2 files changed

+64
-64
lines changed

2 files changed

+64
-64
lines changed

‎src/main/kotlin/io/reactivex/rxkotlin/Flowables.kt‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,109 +10,109 @@ import org.reactivestreams.Publisher
1010

1111
object Flowables {
1212

13-
inline fun <T1,T2,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>, crossinline combineFunction: (T1, T2) -> R) =
13+
inline fun <T1,T2,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>, crossinline combiner: (T1, T2) -> R) =
1414
Flowable.combineLatest(source1, source2,
15-
BiFunction<T1, T2, R> { t1, t2 -> combineFunction(t1,t2) })!!
15+
BiFunction<T1, T2, R> { t1, t2 -> combiner(t1,t2) })!!
1616

17-
inline fun <T1,T2,T3,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, crossinline combineFunction: (T1,T2, T3) -> R) =
17+
inline fun <T1,T2,T3,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, crossinline combiner: (T1,T2, T3) -> R) =
1818
Flowable.combineLatest(source1, source2,source3,
19-
io.reactivex.functions.Function3<T1, T2, T3, R> { t1: T1, t2: T2, t3: T3 -> combineFunction(t1,t2, t3) })!!
19+
io.reactivex.functions.Function3<T1, T2, T3, R> { t1: T1, t2: T2, t3: T3 -> combiner(t1,t2, t3) })!!
2020

2121
inline fun <T1,T2,T3,T4,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>,
22-
source4: Flowable<T4>, crossinline combineFunction: (T1,T2, T3, T4) -> R) =
22+
source4: Flowable<T4>, crossinline combiner: (T1,T2, T3, T4) -> R) =
2323
Flowable.combineLatest(source1, source2,source3, source4,
24-
io.reactivex.functions.Function4<T1, T2, T3, T4, R> { t1: T1, t2: T2, t3: T3, t4: T4 -> combineFunction(t1,t2, t3, t4) })!!
24+
io.reactivex.functions.Function4<T1, T2, T3, T4, R> { t1: T1, t2: T2, t3: T3, t4: T4 -> combiner(t1,t2, t3, t4) })!!
2525

2626

2727
inline fun <T1,T2,T3,T4,T5,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
2828
source3: Flowable<T3>, source4: Flowable<T4>,
29-
source5: Flowable<T5>, crossinline combineFunction: (T1,T2, T3, T4, T5) -> R) =
29+
source5: Flowable<T5>, crossinline combiner: (T1,T2, T3, T4, T5) -> R) =
3030
Flowable.combineLatest(source1, source2,source3, source4, source5,
31-
io.reactivex.functions.Function5<T1, T2, T3, T4, T5, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5 -> combineFunction(t1,t2, t3, t4, t5) })!!
31+
io.reactivex.functions.Function5<T1, T2, T3, T4, T5, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5 -> combiner(t1,t2, t3, t4, t5) })!!
3232

3333

3434
inline fun <T1,T2,T3,T4,T5,T6,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
3535
source3: Flowable<T3>, source4: Flowable<T4>,
36-
source5: Flowable<T5>, source6: Flowable<T6>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6) -> R) =
36+
source5: Flowable<T5>, source6: Flowable<T6>, crossinline combiner: (T1,T2, T3, T4, T5, T6) -> R) =
3737
Flowable.combineLatest(source1, source2,source3, source4, source5, source6,
38-
io.reactivex.functions.Function6<T1, T2, T3, T4, T5, T6, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6 -> combineFunction(t1,t2, t3, t4, t5, t6) })!!
38+
io.reactivex.functions.Function6<T1, T2, T3, T4, T5, T6, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6 -> combiner(t1,t2, t3, t4, t5, t6) })!!
3939

4040
inline fun <T1,T2,T3,T4,T5,T6,T7,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
4141
source3: Flowable<T3>, source4: Flowable<T4>,
4242
source5: Flowable<T5>, source6: Flowable<T6>,
43-
source7: Flowable<T7>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7) -> R) =
43+
source7: Flowable<T7>, crossinline combiner: (T1,T2, T3, T4, T5, T6, T7) -> R) =
4444
Flowable.combineLatest(source1, source2,source3, source4, source5, source6, source7,
45-
io.reactivex.functions.Function7<T1, T2, T3, T4, T5, T6, T7, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7 -> combineFunction(t1,t2, t3, t4, t5, t6, t7) })!!
45+
io.reactivex.functions.Function7<T1, T2, T3, T4, T5, T6, T7, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7 -> combiner(t1,t2, t3, t4, t5, t6, t7) })!!
4646

4747

4848
inline fun <T1,T2,T3,T4,T5,T6,T7,T8,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
4949
source3: Flowable<T3>, source4: Flowable<T4>,
5050
source5: Flowable<T5>, source6: Flowable<T6>,
5151
source7: Flowable<T7>, source8: Flowable<T8>,
52-
crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7, T8) -> R) =
52+
crossinline combiner: (T1,T2, T3, T4, T5, T6, T7, T8) -> R) =
5353
Flowable.combineLatest(source1, source2,source3, source4, source5, source6, source7, source8,
54-
io.reactivex.functions.Function8<T1, T2, T3, T4, T5, T6, T7, T8,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8 -> combineFunction(t1,t2, t3, t4, t5, t6, t7, t8) })!!
54+
io.reactivex.functions.Function8<T1, T2, T3, T4, T5, T6, T7, T8,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8 -> combiner(t1,t2, t3, t4, t5, t6, t7, t8) })!!
5555

5656
inline fun <T1,T2,T3,T4,T5,T6,T7,T8,T9,R> combineLatest(source1: Flowable<T1>, source2: Flowable<T2>,
5757
source3: Flowable<T3>, source4: Flowable<T4>,
5858
source5: Flowable<T5>, source6: Flowable<T6>,
5959
source7: Flowable<T7>, source8: Flowable<T8>,
60-
source9: Flowable<T9>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7, T8, T9) -> R) =
60+
source9: Flowable<T9>, crossinline combiner: (T1,T2, T3, T4, T5, T6, T7, T8, T9) -> R) =
6161
Flowable.combineLatest(source1, source2,source3, source4, source5, source6, source7, source8, source9,
62-
io.reactivex.functions.Function9<T1, T2, T3, T4, T5, T6, T7, T8,T9,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8, t9: T9 -> combineFunction(t1,t2, t3, t4, t5, t6, t7, t8, t9) })!!
62+
io.reactivex.functions.Function9<T1, T2, T3, T4, T5, T6, T7, T8,T9,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8, t9: T9 -> combiner(t1,t2, t3, t4, t5, t6, t7, t8, t9) })!!
6363

6464

6565

6666

67-
inline fun <T1,T2,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, crossinline combineFunction: (T1, T2) -> R) =
67+
inline fun <T1,T2,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, crossinline combiner: (T1, T2) -> R) =
6868
Flowable.zip(source1, source2,
69-
BiFunction<T1, T2, R> { t1, t2 -> combineFunction(t1,t2) })!!
69+
BiFunction<T1, T2, R> { t1, t2 -> combiner(t1,t2) })!!
7070

71-
inline fun <T1,T2,T3,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, crossinline combineFunction: (T1,T2, T3) -> R) =
71+
inline fun <T1,T2,T3,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, crossinline combiner: (T1,T2, T3) -> R) =
7272
Flowable.zip(source1, source2,source3,
73-
io.reactivex.functions.Function3<T1, T2, T3, R> { t1: T1, t2: T2, t3: T3 -> combineFunction(t1,t2, t3) })!!
73+
io.reactivex.functions.Function3<T1, T2, T3, R> { t1: T1, t2: T2, t3: T3 -> combiner(t1,t2, t3) })!!
7474

75-
inline fun <T1,T2,T3,T4,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, source4: Flowable<T4>, crossinline combineFunction: (T1,T2, T3, T4) -> R) =
75+
inline fun <T1,T2,T3,T4,R> zip(source1: Flowable<T1>, source2: Flowable<T2>, source3: Flowable<T3>, source4: Flowable<T4>, crossinline combiner: (T1,T2, T3, T4) -> R) =
7676
Flowable.zip(source1, source2,source3, source4,
77-
io.reactivex.functions.Function4<T1, T2, T3, T4, R> { t1: T1, t2: T2, t3: T3, t4: T4 -> combineFunction(t1,t2, t3, t4) })!!
77+
io.reactivex.functions.Function4<T1, T2, T3, T4, R> { t1: T1, t2: T2, t3: T3, t4: T4 -> combiner(t1,t2, t3, t4) })!!
7878

7979
inline fun <T1,T2,T3,T4,T5,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
8080
source3: Flowable<T3>, source4: Flowable<T4>,
81-
source5: Flowable<T5>, crossinline combineFunction: (T1,T2, T3, T4, T5) -> R) =
81+
source5: Flowable<T5>, crossinline combiner: (T1,T2, T3, T4, T5) -> R) =
8282
Flowable.zip(source1, source2,source3, source4, source5,
83-
io.reactivex.functions.Function5<T1, T2, T3, T4, T5, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5 -> combineFunction(t1,t2, t3, t4, t5) })!!
83+
io.reactivex.functions.Function5<T1, T2, T3, T4, T5, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5 -> combiner(t1,t2, t3, t4, t5) })!!
8484

8585

8686

8787
inline fun <T1,T2,T3,T4,T5,T6,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
8888
source3: Flowable<T3>, source4: Flowable<T4>,
89-
source5: Flowable<T5>, source6: Flowable<T6>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6) -> R) =
89+
source5: Flowable<T5>, source6: Flowable<T6>, crossinline combiner: (T1,T2, T3, T4, T5, T6) -> R) =
9090
Flowable.zip(source1, source2,source3, source4, source5, source6,
91-
io.reactivex.functions.Function6<T1, T2, T3, T4, T5, T6, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6 -> combineFunction(t1,t2, t3, t4, t5, t6) })!!
91+
io.reactivex.functions.Function6<T1, T2, T3, T4, T5, T6, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6 -> combiner(t1,t2, t3, t4, t5, t6) })!!
9292

9393
inline fun <T1,T2,T3,T4,T5,T6,T7,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
9494
source3: Flowable<T3>, source4: Flowable<T4>,
9595
source5: Flowable<T5>, source6: Flowable<T6>,
96-
source7: Flowable<T7>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7) -> R) =
96+
source7: Flowable<T7>, crossinline combiner: (T1,T2, T3, T4, T5, T6, T7) -> R) =
9797
Flowable.zip(source1, source2,source3, source4, source5, source6, source7,
98-
io.reactivex.functions.Function7<T1, T2, T3, T4, T5, T6, T7, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7 -> combineFunction(t1,t2, t3, t4, t5, t6, t7) })!!
98+
io.reactivex.functions.Function7<T1, T2, T3, T4, T5, T6, T7, R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7 -> combiner(t1,t2, t3, t4, t5, t6, t7) })!!
9999

100100

101101
inline fun <T1,T2,T3,T4,T5,T6,T7,T8,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
102102
source3: Flowable<T3>, source4: Flowable<T4>,
103103
source5: Flowable<T5>, source6: Flowable<T6>,
104104
source7: Flowable<T7>, source8: Flowable<T8>,
105-
crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7, T8) -> R) =
105+
crossinline combiner: (T1,T2, T3, T4, T5, T6, T7, T8) -> R) =
106106
Flowable.zip(source1, source2,source3, source4, source5, source6, source7, source8,
107-
io.reactivex.functions.Function8<T1, T2, T3, T4, T5, T6, T7, T8,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8 -> combineFunction(t1,t2, t3, t4, t5, t6, t7, t8) })!!
107+
io.reactivex.functions.Function8<T1, T2, T3, T4, T5, T6, T7, T8,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8 -> combiner(t1,t2, t3, t4, t5, t6, t7, t8) })!!
108108

109109
inline fun <T1,T2,T3,T4,T5,T6,T7,T8,T9,R> zip(source1: Flowable<T1>, source2: Flowable<T2>,
110110
source3: Flowable<T3>, source4: Flowable<T4>,
111111
source5: Flowable<T5>, source6: Flowable<T6>,
112112
source7: Flowable<T7>, source8: Flowable<T8>,
113-
source9: Flowable<T9>, crossinline combineFunction: (T1,T2, T3, T4, T5, T6, T7, T8, T9) -> R) =
113+
source9: Flowable<T9>, crossinline combiner: (T1,T2, T3, T4, T5, T6, T7, T8, T9) -> R) =
114114
Flowable.zip(source1, source2,source3, source4, source5, source6, source7, source8, source9,
115-
io.reactivex.functions.Function9<T1, T2, T3, T4, T5, T6, T7, T8,T9,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8, t9: T9 -> combineFunction(t1,t2, t3, t4, t5, t6, t7, t8, t9) })!!
115+
io.reactivex.functions.Function9<T1, T2, T3, T4, T5, T6, T7, T8,T9,R> { t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8, t9: T9 -> combiner(t1,t2, t3, t4, t5, t6, t7, t8, t9) })!!
116116

117117
}
118118

0 commit comments

Comments
 (0)