Merge pull request #42 from julienrf/2.13.x

Scala 2.13.0 support

Author: SethTisue

build.sbt

@@ -2,14 +2,16 @@ import ScalaModulePlugin._
 
 version in ThisBuild := "0.1.3-SNAPSHOT"
 
+resolvers in ThisBuild += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
+
 scalaVersionsByJvm in ThisBuild := {
-  val v213 = "2.13.0-M3"
+  val v213 = "2.13.0-pre-e40c95e"
   Map(
     8 -> List(v213 -> true),
     11 -> List(v213 -> false))
 }
 
-scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
+scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature"/*, "-Xfatal-warnings"*/)
 
 cancelable in Global := true
 
@@ -72,7 +74,7 @@ lazy val junit = project.in(file("junit"))
 lazy val scalacheck = project.in(file("scalacheck"))
   .settings(commonSettings)
   .settings(
-  libraryDependencies += "org.scalacheck" % "scalacheck_2.12" % "1.14.0",
+  libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.0",
   fork in Test := true,
   testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-workers", "1", "-minSize", "0", "-maxSize", "4000", "-minSuccessfulTests", "5"),
   disablePublishing

core/src/main/scala/scala/collection/DebugUtils.scala

@@ -0,0 +1,21 @@
+package scala.collection
+
+private[collection] object DebugUtils {
+
+  def buildString(closure: (Any => Unit) => Unit): String = {
+    val output = new collection.mutable.StringBuilder
+    closure { any =>
+      output ++= any.toString
+      output += '\n'
+    }
+
+    output.result()
+  }
+
+  def arrayString[T](array: Array[T], from: Int, until: Int): String = {
+    array.slice(from, until) map ({
+      case null => "n/a"
+      case x    => "" + x
+    }: scala.PartialFunction[T, String]) mkString " | "
+  }
+}

core/src/main/scala/scala/collection/Parallel.scala

@@ -0,0 +1,17 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2003-2013, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
+package scala
+package collection
+
+/** A marker trait for collections which have their operations parallelised.
+ *
+ *  @since 2.9
+ *  @author Aleksandar Prokopec
+ */
+trait Parallel

core/src/main/scala/scala/collection/Parallelizable.scala

@@ -24,7 +24,7 @@ import parallel.Combiner
  */
 trait Parallelizable[+A, +ParRepr <: Parallel] extends Any {
 
-  def seq: TraversableOnce[A]
+  def seq: IterableOnce[A]
 
   /** Returns a parallel implementation of this collection.
    *

core/src/main/scala/scala/collection/generic/CanCombineFrom.scala

@@ -24,8 +24,7 @@ import scala.collection.parallel._
  *  @tparam To    the type of the collection to be created.
  *  @since 2.8
  */
-trait CanCombineFrom[-From, -Elem, +To] extends CanBuildFrom[From, Elem, To] with Parallel {
+trait CanCombineFrom[-From, -Elem, +To] extends Parallel {
   def apply(from: From): Combiner[Elem, To]
   def apply(): Combiner[Elem, To]
 }
-

core/src/main/scala/scala/collection/generic/GenericParCompanion.scala

@@ -17,7 +17,7 @@ package generic
 import scala.collection.parallel.Combiner
 import scala.collection.parallel.ParIterable
 import scala.collection.parallel.ParMap
-import scala.language.higherKinds
+import scala.language.{higherKinds, implicitConversions}
 
 /** A template class for companion objects of parallel collection classes.
  *  They should be mixed in together with `GenericCompanion` type.
@@ -27,16 +27,82 @@ import scala.language.higherKinds
  *  @since 2.8
  */
 trait GenericParCompanion[+CC[X] <: ParIterable[X]] {
+
+  /** An empty collection of type `$Coll[A]`
+    *  @tparam A      the type of the ${coll}'s elements
+    */
+  def empty[A]: CC[A] = newBuilder[A].result()
+
+  /** Creates a $coll with the specified elements.
+    *  @tparam A      the type of the ${coll}'s elements
+    *  @param elems  the elements of the created $coll
+    *  @return a new $coll with elements `elems`
+    */
+  def apply[A](elems: A*): CC[A] = {
+    if (elems.isEmpty) empty[A]
+    else {
+      val b = newBuilder[A]
+      b ++= elems
+      b.result()
+    }
+  }
+
   /** The default builder for $Coll objects.
    */
   def newBuilder[A]: Combiner[A, CC[A]]
 
   /** The parallel builder for $Coll objects.
    */
   def newCombiner[A]: Combiner[A, CC[A]]
+
+  implicit def toFactory[A]: Factory[A, CC[A]] = GenericParCompanion.toFactory(this)
+
+}
+
+
+// TODO Specialize `Factory` with parallel collection creation methods so that the `xs.to(ParArray)` syntax
+// does build the resulting `ParArray` in parallel
+object GenericParCompanion {
+  /**
+    * Implicit conversion for converting any `ParFactory` into a sequential `Factory`.
+    * This provides supports for the `to` conversion method (eg, `xs.to(ParArray)`).
+    */
+  implicit def toFactory[A, CC[X] <: ParIterable[X]](parFactory: GenericParCompanion[CC]): Factory[A, CC[A]] =
+    new ToFactory(parFactory)
+
+  @SerialVersionUID(3L)
+  private class ToFactory[A, CC[X] <: ParIterable[X]](parFactory: GenericParCompanion[CC])
+    extends Factory[A, CC[A]] with Serializable{
+      def fromSpecific(it: IterableOnce[A]): CC[A] = (parFactory.newBuilder[A] ++= it).result()
+      def newBuilder: mutable.Builder[A, CC[A]] = parFactory.newBuilder
+  }
+
 }
 
 trait GenericParMapCompanion[+CC[P, Q] <: ParMap[P, Q]] {
+
   def newCombiner[P, Q]: Combiner[(P, Q), CC[P, Q]]
+
+  implicit def toFactory[K, V]: Factory[(K, V), CC[K, V]] = GenericParMapCompanion.toFactory(this)
+
 }
 
+object GenericParMapCompanion {
+  /**
+    * Implicit conversion for converting any `ParFactory` into a sequential `Factory`.
+    * This provides supports for the `to` conversion method (eg, `xs.to(ParMap)`).
+    */
+  implicit def toFactory[K, V, CC[X, Y] <: ParMap[X, Y]](
+    parFactory: GenericParMapCompanion[CC]
+  ): Factory[(K, V), CC[K, V]] =
+    new ToFactory[K, V, CC](parFactory)
+
+  @SerialVersionUID(3L)
+  private class ToFactory[K, V, CC[X, Y] <: ParMap[X, Y]](
+    parFactory: GenericParMapCompanion[CC]
+  ) extends Factory[(K, V), CC[K, V]] with Serializable {
+    def fromSpecific(it: IterableOnce[(K, V)]): CC[K, V] = (parFactory.newCombiner[K, V] ++= it).result()
+    def newBuilder: mutable.Builder[(K, V), CC[K, V]] = parFactory.newCombiner
+  }
+
+}

core/src/main/scala/scala/collection/generic/GenericParTemplate.scala

@@ -29,10 +29,10 @@ import scala.language.higherKinds
  *  @since 2.8
  */
 trait GenericParTemplate[+A, +CC[X] <: ParIterable[X]]
-extends GenericTraversableTemplate[A, CC]
-   with HasNewCombiner[A, CC[A] @uncheckedVariance]
+  extends GenericTraversableTemplate[A, CC]
+    with HasNewCombiner[A, CC[A] @uncheckedVariance]
 {
-  def companion: GenericCompanion[CC] with GenericParCompanion[CC]
+  def companion: GenericParCompanion[CC]
 
   protected[this] override def newBuilder: scala.collection.mutable.Builder[A, CC[A]] = newCombiner