Audit sizeHint

Author: som-snytt

library/src/scala/collection/ArrayOps.scala

@@ -1174,8 +1174,7 @@ final class ArrayOps[A](private val xs: Array[A]) extends AnyVal {
   /** A copy of this array with all elements of a collection appended. */
   def appendedAll[B >: A : ClassTag](suffix: IterableOnce[B]): Array[B] = {
     val b = ArrayBuilder.make[B]
-    val k = suffix.knownSize
-    if(k >= 0) b.sizeHint(k + xs.length)
+    b.sizeHint(suffix, delta = xs.length)
     b.addAll(xs)
     b.addAll(suffix)
     b.result()

library/src/scala/collection/Factory.scala

@@ -61,7 +61,7 @@ object Factory {
   private class ArrayFactory[A: ClassTag] extends Factory[A, Array[A]] with Serializable {
     def fromSpecific(it: IterableOnce[A]): Array[A] = {
       val b = newBuilder
-      b.sizeHint(scala.math.max(0, it.knownSize))
+      b.sizeHint(it, delta = 0)
       b ++= it
       b.result()
     }

library/src/scala/collection/StrictOptimizedSeqOps.scala

@@ -34,19 +34,15 @@ trait StrictOptimizedSeqOps [+A, +CC[_], +C]
 
   override def prepended[B >: A](elem: B): CC[B] = {
     val b = iterableFactory.newBuilder[B]
-    if (knownSize >= 0) {
-      b.sizeHint(size + 1)
-    }
+    b.sizeHint(this, delta = 1)
     b += elem
     b ++= this
     b.result()
   }
 
   override def appended[B >: A](elem: B): CC[B] = {
     val b = iterableFactory.newBuilder[B]
-    if (knownSize >= 0) {
-      b.sizeHint(size + 1)
-    }
+    b.sizeHint(this, delta = 1)
     b ++= this
     b += elem
     b.result()

library/src/scala/collection/immutable/StrictOptimizedSeqOps.scala

@@ -14,9 +14,8 @@ package scala
 package collection
 package immutable
 
-/**
-  * Trait that overrides operations to take advantage of strict builders.
-  */
+/** Trait that overrides operations to take advantage of strict builders.
+ */
 trait StrictOptimizedSeqOps[+A, +CC[_], +C]
   extends Any
     with SeqOps[A, CC, C]
@@ -41,9 +40,7 @@ trait StrictOptimizedSeqOps[+A, +CC[_], +C]
   override def updated[B >: A](index: Int, elem: B): CC[B] = {
     if (index < 0) throw new IndexOutOfBoundsException(s"$index is out of bounds (min 0, max ${if (knownSize>=0) knownSize else "unknown"})")
     val b = iterableFactory.newBuilder[B]
-    if (knownSize >= 0) {
-      b.sizeHint(size)
-    }
+    b.sizeHint(this)
     var i = 0
     val it = iterator
     while (i < index && it.hasNext) {

library/src/scala/collection/immutable/WrappedString.scala

@@ -125,8 +125,7 @@ final class WrappedString(private val self: String) extends AbstractSeq[Char] wi
 object WrappedString extends SpecificIterableFactory[Char, WrappedString] {
   def fromSpecific(it: IterableOnce[Char]): WrappedString = {
     val b = newBuilder
-    val s = it.knownSize
-    if(s >= 0) b.sizeHint(s)
+    b.sizeHint(it)
     b ++= it
     b.result()
   }

library/src/scala/collection/mutable/ArraySeq.scala

@@ -43,8 +43,7 @@ sealed abstract class ArraySeq[T]
 
   override protected def fromSpecific(coll: scala.collection.IterableOnce[T]): ArraySeq[T] = {
     val b = ArrayBuilder.make(elemTag).asInstanceOf[ArrayBuilder[T]]
-    val s = coll.knownSize
-    if(s > 0) b.sizeHint(s)
+    b.sizeHint(coll, delta = 0)
     b ++= coll
     ArraySeq.make(b.result())
   }

library/src/scala/collection/mutable/CollisionProofHashMap.scala

@@ -174,8 +174,7 @@ final class CollisionProofHashMap[K, V](initialCapacity: Int, loadFactor: Double
   }
 
   override def addAll(xs: IterableOnce[(K, V)]): this.type = {
-    val k = xs.knownSize
-    if(k > 0) sizeHint(contentSize + k)
+    sizeHint(xs, delta = contentSize)
     super.addAll(xs)
   }
 

library/src/scala/collection/mutable/HashMap.scala

@@ -95,7 +95,7 @@ class HashMap[K, V](initialCapacity: Int, loadFactor: Double)
   }
 
   override def addAll(xs: IterableOnce[(K, V)]): this.type = {
-    sizeHint(xs.knownSize)
+    sizeHint(xs)
 
     xs match {
       case hm: immutable.HashMap[K, V] =>

library/src/scala/collection/mutable/HashSet.scala

@@ -91,7 +91,7 @@ final class HashSet[A](initialCapacity: Int, loadFactor: Double)
   }
 
   override def addAll(xs: IterableOnce[A]): this.type = {
-    sizeHint(xs.knownSize)
+    sizeHint(xs, delta = 0)
     xs match {
       case hs: immutable.HashSet[A] =>
         hs.foreachWithHash((k, h) => addElem(k, improveHash(h)))

library/src/scala/collection/mutable/LinkedHashMap.scala

@@ -480,7 +480,7 @@ object LinkedHashMap extends MapFactory[LinkedHashMap] {
 
   def from[K, V](it: collection.IterableOnce[(K, V)]) = {
     val newlhm = empty[K, V]
-    newlhm.sizeHint(it.knownSize)
+    newlhm.sizeHint(it, delta = 0)
     newlhm.addAll(it)
     newlhm
   }