Skip to content

Commit aac1903

Browse files
committed
Update the signature of lift
1 parent 9d319bc commit aac1903

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/JavaConversions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ object JavaConversions {
5555
}
5656
}
5757

58-
implicit def toJavaOperator[T, R](operator: Subscriber[R] => Subscriber[_ >: T]): rx.Observable.Operator[R, T] = {
58+
implicit def toJavaOperator[T, R](operator: Subscriber[R] => Subscriber[T]): rx.Observable.Operator[R, T] = {
5959
new rx.Observable.Operator[R, T] {
6060
override def call(subscriber: rx.Subscriber[_ >: R]): rx.Subscriber[_ >: T] = {
6161
toJavaSubscriber[T](operator(toScalaSubscriber[R](subscriber)))

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2572,7 +2572,7 @@ trait Observable[+T]
25722572
* @return an Observable that emits values that are the result of applying the bind function to the values
25732573
* of the current Observable
25742574
*/
2575-
def lift[R](operator: Subscriber[R] => Subscriber[_ >: T]): Observable[R] = {
2575+
def lift[R](operator: Subscriber[R] => Subscriber[T]): Observable[R] = {
25762576
toScalaObservable(asJavaObservable.lift(toJavaOperator[T, R](operator)))
25772577
}
25782578
}

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/CompletenessTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class CompletenessTest extends JUnitSuite {
7979
"firstOrDefault(T)" -> "firstOrElse(=> U)",
8080
"firstOrDefault(Func1[_ >: T, Boolean], T)" -> "[use `.filter(condition).firstOrElse(default)`]",
8181
"groupBy(Func1[_ >: T, _ <: K], Func1[_ >: T, _ <: R])" -> "[use `groupBy` and `map`]",
82-
"lift(Operator[_ <: R, _ >: T])" -> "lift(Subscriber[R] => Subscriber[_ >: T])",
82+
"lift(Operator[_ <: R, _ >: T])" -> "lift(Subscriber[R] => Subscriber[T])",
8383
"mapMany(Func1[_ >: T, _ <: Observable[_ <: R]])" -> "flatMap(T => Observable[R])",
8484
"mapWithIndex(Func2[_ >: T, Integer, _ <: R])" -> "[combine `zipWithIndex` with `map` or with a for comprehension]",
8585
"onErrorResumeNext(Func1[Throwable, _ <: Observable[_ <: T]])" -> "onErrorResumeNext(Throwable => Observable[U])",

0 commit comments

Comments
 (0)