Skip to content

Make ArraySeq extend IndexedSeqOptimized #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 12, 2023
Merged

Make ArraySeq extend IndexedSeqOptimized #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d27b1a5
Make ArraySeq extends IndexedSeqOptimized
RustedBones Feb 13, 2023
76f76fd
Run scalafmt
RustedBones Feb 14, 2023
9d64f5c
test
lrytz Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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

Expand Down
7 changes: 7 additions & 0 deletions compat/src/test/scala/test/scala/collection/ArraySeqTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}