Skip to content

Commit b6c934b

Browse files
committed
remove certain deprecations, unnecessary inlines
1 parent 5edc87f commit b6c934b

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ object Flowables {
150150
inline fun <T, U, R> Flowable<T>.withLatestFrom(other: Publisher<U>, crossinline combiner: (T, U) -> R): Flowable<R>
151151
= withLatestFrom(other, BiFunction<T, U, R> { t, u -> combiner.invoke(t, u) })
152152

153-
inline fun <T, U> Flowable<T>.withLatestFrom(other: Publisher<U>): Flowable<Pair<T, U>>
153+
fun <T, U> Flowable<T>.withLatestFrom(other: Publisher<U>): Flowable<Pair<T, U>>
154154
= withLatestFrom(other, BiFunction{ t, u -> Pair(t,u) })
155155

156156

@@ -160,7 +160,7 @@ inline fun <T, U> Flowable<T>.withLatestFrom(other: Publisher<U>): Flowable<Pair
160160
inline fun <T, T1, T2, R> Flowable<T>.withLatestFrom(o1: Publisher<T1>, o2: Publisher<T2>, crossinline combiner: (T, T1, T2) -> R): Flowable<R>
161161
= withLatestFrom(o1, o2, Function3 { t, t1, t2 -> combiner.invoke(t, t1, t2) })
162162

163-
inline fun <T, T1, T2> Flowable<T>.withLatestFrom(o1: Publisher<T1>, o2: Publisher<T2>): Publisher<Triple<T,T1,T2>>
163+
fun <T, T1, T2> Flowable<T>.withLatestFrom(o1: Publisher<T1>, o2: Publisher<T2>): Publisher<Triple<T,T1,T2>>
164164
= withLatestFrom(o1, o2, Function3 { t, t1, t2 -> Triple(t, t1, t2) })
165165

166166
/**
@@ -184,5 +184,5 @@ inline fun <T, U, R> Flowable<T>.zipWith(other: Publisher<U>, crossinline zipper
184184
/**
185185
* Emits a zipped `Pair`
186186
*/
187-
inline fun <T, U> Flowable<T>.zipWith(other: Publisher<U>): Flowable<Pair<T, U>>
187+
fun <T, U> Flowable<T>.zipWith(other: Publisher<U>): Flowable<Pair<T, U>>
188188
= zipWith(other, BiFunction { t, u -> Pair(t,u) })

src/main/kotlin/io/reactivex/rxkotlin/Observables.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ inline fun <T, U, R> Observable<T>.withLatestFrom(other: ObservableSource<U>, cr
154154
/**
155155
* Emits a `Pair`
156156
*/
157-
inline fun <T, U> Observable<T>.withLatestFrom(other: ObservableSource<U>): Observable<Pair<T,U>>
157+
fun <T, U> Observable<T>.withLatestFrom(other: ObservableSource<U>): Observable<Pair<T,U>>
158158
= withLatestFrom(other, BiFunction{ t, u -> Pair(t,u) })
159159

160160
/**
@@ -163,7 +163,7 @@ inline fun <T, U> Observable<T>.withLatestFrom(other: ObservableSource<U>): Obse
163163
inline fun <T, T1, T2, R> Observable<T>.withLatestFrom(o1: ObservableSource<T1>, o2: ObservableSource<T2>, crossinline combiner: (T, T1, T2) -> R): Observable<R>
164164
= withLatestFrom(o1, o2, Function3<T, T1, T2, R> { t, t1, t2 -> combiner.invoke(t, t1, t2) })
165165

166-
inline fun <T, T1, T2> Observable<T>.withLatestFrom(o1: ObservableSource<T1>, o2: ObservableSource<T2>): Observable<Triple<T,T1,T2>>
166+
fun <T, T1, T2> Observable<T>.withLatestFrom(o1: ObservableSource<T1>, o2: ObservableSource<T2>): Observable<Triple<T,T1,T2>>
167167
= withLatestFrom(o1, o2, Function3 { t, t1, t2 -> Triple(t, t1, t2) })
168168

169169
/**
@@ -187,5 +187,5 @@ inline fun <T, U, R> Observable<T>.zipWith(other: ObservableSource<U>, crossinli
187187
/**
188188
* Emits a zipped `Pair`
189189
*/
190-
inline fun <T, U> Observable<T>.zipWith(other: ObservableSource<U>): Observable<Pair<T,U>>
190+
fun <T, U> Observable<T>.zipWith(other: ObservableSource<U>): Observable<Pair<T,U>>
191191
= zipWith(other, BiFunction { t, u -> Pair(t,u) })

src/main/kotlin/io/reactivex/rxkotlin/observable.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,6 @@ private fun <T : Any> Iterator<T>.toIterable() = object : Iterable<T> {
6767
override fun iterator(): Iterator<T> = this@toIterable
6868
}
6969

70-
@Deprecated("Use `Observables.combineLatest() factory")
71-
fun <T : Any, R : Any> Observable<T>.combineLatest(observable: Observable<R>): Observable<Pair<T, R>>
72-
= Observable.combineLatest(this, observable, BiFunction(::Pair))
73-
74-
75-
@Deprecated("Use `Observables.combineLatest() factory")
76-
fun <T : Any, R : Any, U : Any> Observable<T>.combineLatest(observable1: Observable<R>, observable2: Observable<U>): Observable<Triple<T, R, U>>
77-
= Observable.combineLatest(this, observable1, observable2, Function3(::Triple))
78-
7970
// EXTENSION FUNCTION OPERATORS
8071

8172
/**

0 commit comments

Comments
 (0)