Merge pull request #581 from RustedBones/typed-can-build-from

lrytz · web-flow · commit cd00be9fd042 · 2023-04-12T11:39:00.000+02:00
Make ArraySeq extends IndexedSeqOptimized
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
@@ -15,7 +15,7 @@ package scala.collection.compat.immutable
 import java.util.Arrays
 
 import scala.annotation.unchecked.uncheckedVariance
-import scala.collection.AbstractSeq
+import scala.collection.{AbstractSeq, IndexedSeqOptimized}
 import scala.collection.generic._
 import scala.collection.immutable.IndexedSeq
 import scala.collection.mutable.{ArrayBuilder, Builder, WrappedArrayBuilder}
@@ -34,7 +34,10 @@ import scala.util.hashing.MurmurHash3
  *  @define mayNotTerminateInf
  *  @define willNotTerminateInf
  */
-abstract class ArraySeq[+T] extends AbstractSeq[T] with IndexedSeq[T] {
+abstract class ArraySeq[+T]
+    extends AbstractSeq[T]
+    with IndexedSeq[T]
+    with IndexedSeqOptimized[T, ArraySeq[T]] {
 
   override protected[this] def thisCollection: ArraySeq[T] = this
 
diff --git a/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala b/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala
@@ -72,4 +72,11 @@ class ArraySeqTest {
     Assert.assertEquals(ArraySeq[T](), array.slice(1, 1))
     Assert.assertEquals(ArraySeq[T](), array.slice(2, 1))
   }
+
+  @Test def ArraySeqIndexedSeqOptimized(): Unit = {
+    val x                = ArraySeq(1, 2)
+    val y                = ArraySeq(3, 4)
+    val z: ArraySeq[Int] = x ++ y
+    assert(z.toList == List(1, 2, 3, 4))
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -72,4 +72,11 @@ class ArraySeqTest {`
`72`	`72`	`Assert.assertEquals(ArraySeq[T](), array.slice(1, 1))`
`73`	`73`	`Assert.assertEquals(ArraySeq[T](), array.slice(2, 1))`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ @Test def ArraySeqIndexedSeqOptimized(): Unit = {`
	`77`	`+ val x = ArraySeq(1, 2)`
	`78`	`+ val y = ArraySeq(3, 4)`
	`79`	`+ val z: ArraySeq[Int] = x ++ y`
	`80`	`+ assert(z.toList == List(1, 2, 3, 4))`
	`81`	`+ }`
`75`	`82`	`}`