Move StreamConverters to javaapi

scala · Apr 24, 2019 · c9ab1fa · c9ab1fa
1 parent 463559f
commit c9ab1fa
Show file tree

Hide file tree

Showing 8 changed files with 379 additions and 360 deletions.
diff --git a/src/library/scala/jdk/Accumulator.scala b/src/library/scala/jdk/Accumulator.scala
@@ -27,7 +27,7 @@ import scala.collection.{Stepper, StepperShape, mutable}
   * stream pipeline into a Scala collection. The
   * [[scala.collection.convert.StreamExtensions.StreamHasToScala.toScala]] extension method on Java
   * streams (available by importing
-  * [[scala.jdk.StreamConverters.Ops `scala.jdk.StreamConverters.Ops._`]]) is specialized for
+  * [[scala.jdk.StreamConverters `scala.jdk.StreamConverters._`]]) is specialized for
   * Accumulators: they are built in parallel, the parts are merged efficiently.
   *
   * Building specialized Accumulators is handled transparently. As a user, using the
@@ -38,8 +38,8 @@ import scala.collection.{Stepper, StepperShape, mutable}
   * deadlocks, see [[https://github.com/scala/bug/issues/9076]].
   *
   * {{{
-  *   scala> import scala.jdk.StreamConverters.Ops._
-  *   import scala.jdk.StreamConverters.Ops._
+  *   scala> import scala.jdk.StreamConverters._
+  *   import scala.jdk.StreamConverters._
   *
   *   scala> def isPrime(n: Int): Boolean = !(2 +: (3 to Math.sqrt(n).toInt by 2) exists (n % _ == 0))
   *   isPrime: (n: Int)Boolean

diff --git a/src/library/scala/jdk/StreamConverters.scala b/src/library/scala/jdk/StreamConverters.scala
diff --git a/src/library/scala/jdk/javaapi/CollectionConverters.scala b/src/library/scala/jdk/javaapi/CollectionConverters.scala
@@ -13,7 +13,6 @@
 package scala.jdk.javaapi
 
 import scala.collection.convert.{AsJavaConverters, AsScalaConverters}
-import scala.jdk.StreamConverters
 
 /** This object contains methods that convert between Scala and Java collections.
   *

diff --git a/src/library/scala/jdk/javaapi/StreamConverters.scala b/src/library/scala/jdk/javaapi/StreamConverters.scala
diff --git a/test/junit/scala/jdk/StepperTest.scala b/test/junit/scala/jdk/StepperTest.scala
@@ -20,7 +20,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
 import scala.collection.{AnyStepper, ClassTagIterableFactory, IntStepper, IterableFactory, MapFactory, SortedIterableFactory, SortedMapFactory, SpecificIterableFactory, Stepper, concurrent => cc, immutable => ci, mutable => cm}
-import scala.jdk.StreamConverters.Ops._
+import scala.jdk.StreamConverters._
 import scala.util.chaining._
 
 

diff --git a/test/junit/scala/jdk/StreamConvertersTest.scala b/test/junit/scala/jdk/StreamConvertersTest.scala
@@ -19,7 +19,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
-import StreamConverters.Ops._
+import scala.jdk.StreamConverters._
 
 @RunWith(classOf[JUnit4])
 class StreamConvertersTest {
@@ -122,7 +122,7 @@ class StreamConvertersTest {
     assert(newLongStream(1).boxed.asJavaPrimitiveStream.isInstanceOf[LongStream])
   }
 
-  import collection.mutable.{ ArrayBuffer, ArraySeq }
+  import collection.mutable.{ArrayBuffer, ArraySeq}
   def abufO(n: Int) = { val ab = new ArrayBuffer[String]; arrayO(n).foreach(ab += _); ab }
   def abufD(n: Int) = { val ab = new ArrayBuffer[Double]; arrayD(n).foreach(ab += _); ab }
   def abufI(n: Int) = { val ab = new ArrayBuffer[Int]; arrayI(n).foreach(ab += _); ab }

diff --git a/test/junit/scala/jdk/StreamConvertersTypingTest.scala b/test/junit/scala/jdk/StreamConvertersTypingTest.scala
@@ -26,7 +26,7 @@ import scala.collection._
 class StreamConvertersTypingTest {
   @Test
   def keyValueSteppers(): Unit = {
-    import scala.jdk.StreamConverters.Ops._
+    import scala.jdk.StreamConverters._
 
     // The steppers of LinkedHashMap and LinkedHashSet are not EfficientSplit, because they use
     // the default IterableOnce.stepper. We cannot use XTableStepper because that would not yield
@@ -108,7 +108,7 @@ class StreamConvertersTypingTest {
 
   @Test
   def convertStreamToScala(): Unit = {
-    import scala.jdk.StreamConverters.Ops._
+    import scala.jdk.StreamConverters._
 
     for (par <- List(false, true)) {
       def is = { val s = Vector(1).asJavaSeqStream; if (par) s.parallel else s }
@@ -255,7 +255,7 @@ class StreamConvertersTypingTest {
     }
 
     locally {
-      import scala.jdk.StreamConverters.Ops._
+      import scala.jdk.StreamConverters._
       val ils = il.stepper
       (ils: IntStepper /*with EfficientSubstep*/).nextStep(): Int
       val ivs = iv.stepper
@@ -393,7 +393,7 @@ class StreamConvertersTypingTest {
     def ps1: IntStepper with EfficientSplit = r.codePointStepper
 
     locally {
-      import scala.jdk.StreamConverters.Ops._
+      import scala.jdk.StreamConverters._
       val rss = r.asJavaSeqStream
       (rss: IntStream).count()
       val rps = r.asJavaParStream
@@ -430,7 +430,7 @@ class StreamConvertersTypingTest {
     val sa = Accumulator("a", "b", "c")
 
     locally {
-      import scala.jdk.StreamConverters.Ops._
+      import scala.jdk.StreamConverters._
 
       val ias = ia.stepper
       (ias: IntStepper with EfficientSplit).asJavaParStream.count()

diff --git a/...t/scala/jdk/StreamConvertersJavaTest.java → ...jdk/javaapi/StreamConvertersJavaTest.java b/...t/scala/jdk/StreamConvertersJavaTest.java → ...jdk/javaapi/StreamConvertersJavaTest.java
@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package scala.jdk;
+package scala.jdk.javaapi;
 
 import org.junit.Test;
 import scala.Tuple2;