Skip to content

Commit 04f69b2

Browse files
move ImplicitFunctionConversions out of internal package
1 parent 92f6bc1 commit 04f69b2

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.lang.scala.internal
16+
package rx.lang.scala
1717

1818

1919
import java.{lang => jlang}
@@ -25,10 +25,6 @@ import rx.util.functions.Func2
2525
import rx.util.functions.Func3
2626
import rx.util.functions.Func4
2727
import java.{lang => jlang}
28-
import rx.Observer
29-
import rx.Subscription
30-
import java.{lang => jlang}
31-
import scala.language.implicitConversions
3228

3329
/**
3430
* These function conversions are only used by the ScalaAdapter, users of RxScala don't need them.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Observable[+T](val asJava: rx.Observable[_ <: T])
3838
import rx.util.functions._
3939
import rx.lang.scala.{Notification, Subscription, Scheduler, Observer}
4040
import rx.lang.scala.util._
41-
import rx.lang.scala.internal.ImplicitFunctionConversions._
41+
import rx.lang.scala.ImplicitFunctionConversions._
4242

4343
/**
4444
* An {@link Observer} must call an Observable's {@code subscribe} method in order to
@@ -1456,7 +1456,7 @@ object Observable {
14561456
import rx.{Observable => JObservable}
14571457
import rx.lang.scala.{Notification, Subscription, Scheduler, Observer}
14581458
import rx.lang.scala.util._
1459-
import rx.lang.scala.internal.ImplicitFunctionConversions._
1459+
import rx.lang.scala.ImplicitFunctionConversions._
14601460

14611461
private[scala]
14621462
def jObsOfListToScObsOfSeq[T](jObs: rx.Observable[_ <: java.util.List[T]]): Observable[Seq[T]] = {
@@ -1774,7 +1774,7 @@ object Observable {
17741774
// "implementation restriction: nested class is not allowed in value class.
17751775
// This restriction is planned to be removed in subsequent releases."
17761776
class WithFilter[+T] private[scala] (p: T => Boolean, asJava: rx.Observable[_ <: T]) {
1777-
import rx.lang.scala.internal.ImplicitFunctionConversions._
1777+
import rx.lang.scala.ImplicitFunctionConversions._
17781778

17791779
def map[B](f: T => B): Observable[B] = {
17801780
Observable[B](asJava.filter(p).map[B](f))

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/observables/BlockingObservable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package rx.lang.scala.observables
1717

1818
import scala.collection.JavaConverters._
19-
import rx.lang.scala.internal.ImplicitFunctionConversions._
19+
import rx.lang.scala.ImplicitFunctionConversions._
2020

2121
class BlockingObservable[+T](val asJava: rx.observables.BlockingObservable[_ <: T])
2222
extends AnyVal

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/observables/ConnectableObservable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ class ConnectableObservable[+T](val asJava: rx.observables.ConnectableObservable
2020
import rx.lang.scala._
2121
import rx.lang.scala.util._
2222
import rx.{Observable => JObservable}
23-
import rx.lang.scala.internal.ImplicitFunctionConversions._
23+
import rx.lang.scala.ImplicitFunctionConversions._
2424

2525
}

0 commit comments

Comments
 (0)