Merge pull request #67 from lrytz/2.13-rc3

Changes for 2.13.0-RC3

Author: SethTisue

build.sbt

@@ -5,7 +5,7 @@ version in ThisBuild := "0.2.1-SNAPSHOT"
 resolvers in ThisBuild += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
 
 scalaVersionsByJvm in ThisBuild := {
-  val v213 = "2.13.0-RC2"
+  val v213 = "2.13.0-RC3"
   Map(
     8 -> List(v213 -> true),
     11 -> List(v213 -> false),

core/src/main/scala/scala/collection/parallel/ParMapLike.scala

@@ -147,15 +147,15 @@ self =>
     def - (elem: K): ParSet[K] =
       ParSet[K]() ++ this - elem // !!! concrete overrides abstract problem
     def size = self.size
-    def knownSize = self.knownSize
+    override def knownSize = self.knownSize
     override def foreach[U](f: K => U) = for ((k, v) <- self) f(k)
     override def seq = self.seq.keySet
   }
 
   protected class DefaultValuesIterable extends ParIterable[V] {
     def splitter = valuesIterator(self.splitter)
     def size = self.size
-    def knownSize = self.knownSize
+    override def knownSize = self.knownSize
     override def foreach[U](f: V => U) = for ((k, v) <- self) f(v)
     def seq = self.seq.values
   }
@@ -174,7 +174,7 @@ self =>
     def get(key: K) = if (!p(key)) None else self.get(key)
     def seq = self.seq.view.filterKeys(p).to(Map)
     def size = filtered.size
-    def knownSize = filtered.knownSize
+    override def knownSize = filtered.knownSize
     def + [U >: V](kv: (K, U)): ParMap[K, U] = ParMap[K, U]() ++ this + kv
     def - (key: K): ParMap[K, V] = ParMap[K, V]() ++ this - key
   }
@@ -183,7 +183,7 @@ self =>
     override def foreach[U](g: ((K, S)) => U): Unit = for ((k, v) <- self) g((k, f(v)))
     def splitter = self.splitter.map(kv => (kv._1, f(kv._2)))
     def size = self.size
-    def knownSize = self.knownSize
+    override def knownSize = self.knownSize
     override def contains(key: K) = self.contains(key)
     def get(key: K) = self.get(key).map(f)
     def seq = self.seq.view.mapValues(f).to(Map)

core/src/main/scala/scala/collection/parallel/immutable/ParHashMap.scala

@@ -70,7 +70,7 @@ self =>
 
   override def size = trie.size
 
-  def knownSize = trie.size
+  override def knownSize = trie.size
 
   protected override def reuse[S, That](oldc: Option[Combiner[S, That]], newc: Combiner[S, That]) = oldc match {
     case Some(old) => old

core/src/main/scala/scala/collection/parallel/immutable/ParHashSet.scala

@@ -69,7 +69,7 @@ self =>
   def contains(e: T): Boolean = trie.contains(e)
 
   def size = trie.size
-  def knownSize = trie.size
+  override def knownSize = trie.size
 
   protected override def reuse[S, That](oldc: Option[Combiner[S, That]], newc: Combiner[S, That]) = oldc match {
     case Some(old) => old

core/src/main/scala/scala/collection/parallel/immutable/ParMap.scala

@@ -101,7 +101,7 @@ object ParMap extends ParMapFactory[ParMap] {
 
   class WithDefault[K, +V](underlying: ParMap[K, V], d: K => V)
   extends scala.collection.parallel.ParMap.WithDefault[K, V](underlying, d) with ParMap[K, V] {
-    def knownSize = underlying.knownSize
+    override def knownSize = underlying.knownSize
     override def empty = new WithDefault(underlying.empty, d)
     override def updated[U >: V](key: K, value: U): WithDefault[K, U] = new WithDefault[K, U](underlying.updated[U](key, value), d)
     override def + [U >: V](kv: (K, U)): WithDefault[K, U] = updated(kv._1, kv._2)

core/src/main/scala/scala/collection/parallel/immutable/ParRange.scala

@@ -44,7 +44,7 @@ self =>
   override def seq = range
 
   @inline final def length = range.length
-  @inline final def knownSize = range.knownSize
+  @inline final override def knownSize = range.knownSize
 
   @inline final def apply(idx: Int) = range.apply(idx)
 

core/src/main/scala/scala/collection/parallel/immutable/ParVector.scala

@@ -52,7 +52,7 @@ extends ParSeq[T]
   def apply(idx: Int) = vector.apply(idx)
 
   def length = vector.length
-  def knownSize = vector.knownSize
+  override def knownSize = vector.knownSize
 
   def splitter: SeqSplitter[T] = {
     val pit = new ParVectorIterator(vector.startIndex, vector.endIndex)

core/src/main/scala/scala/collection/parallel/immutable/package.scala

@@ -27,7 +27,7 @@ package immutable {
     self =>
 
     def apply(idx: Int) = if (0 <= idx && idx < length) elem else throw new IndexOutOfBoundsException("" + idx)
-    def knownSize = length
+    override def knownSize = length
     override def seq: collection.immutable.Seq[T] = new collection.AbstractSeq[T] with collection.immutable.Seq[T] with CustomParallelizable[T, ParSeq[T]] {
         override def length: Int = self.length
         override def apply(idx: Int): T = self.apply(idx)

core/src/main/scala/scala/collection/parallel/mutable/ParArray.scala

@@ -82,7 +82,7 @@ self =>
   }
 
   def length = sz
-  def knownSize = sz
+  override def knownSize = sz
 
   def seq = (if (length == arrayseq.length) arrayseq else arrayseq.take(length)): ArraySeq[T]
 

core/src/main/scala/scala/collection/parallel/mutable/ParMap.scala

@@ -33,6 +33,7 @@ extends parallel.ParMap[K, V]
    with GenericParMapTemplate[K, V, ParMap]
    with ParMapLike[K, V, ParMap, ParMap[K, V], mutable.Map[K, V]]
 {
+  override def knownSize: Int = -1
 
   protected[this] override def newCombiner: Combiner[(K, V), ParMap[K, V]] = ParMap.newCombiner[K, V]
 

core/src/main/scala/scala/collection/parallel/mutable/ParMapLike.scala

@@ -43,6 +43,8 @@ extends scala.collection.parallel.ParIterableLike[(K, V), ParIterable, Repr, Seq
 {
   // note: should not override toMap
 
+  override def knownSize: Int = -1
+
   def put(key: K, value: V): Option[V]
 
   def +[U >: V](kv: (K, U)) = this.clone().asInstanceOf[CC[K, U]] += kv

core/src/main/scala/scala/collection/parallel/mutable/ParSet.scala

@@ -27,6 +27,7 @@ extends ParIterable[T]
    with ParSetLike[T, ParSet, ParSet[T], scala.collection.mutable.Set[T]]
 {
 self =>
+  override def knownSize: Int = -1
   override def companion: GenericParCompanion[ParSet] = ParSet
   override def empty: ParSet[T] = ParHashSet()
   def seq: scala.collection.mutable.Set[T]

core/src/main/scala/scala/collection/parallel/mutable/ParSetLike.scala

@@ -42,6 +42,8 @@ extends scala.collection.parallel.ParIterableLike[T, CC, Repr, Sequential]
    with Cloneable[Repr]
 {
 self =>
+  override def knownSize: Int = -1
+
   override def empty: Repr
 
   def addOne(elem: T): this.type