summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2010-04-05 16:53:53 +0000
committerMartin Odersky <odersky@gmail.com>2010-04-05 16:53:53 +0000
commitb454bbc5a4b615b474bb9860f336fd86346df4cf (patch)
tree533773813468e308e1d9701050d7f5dea9121c3d /src/library
parentd59bde5a111dbdd40821c3bae4a956cc53db992e (diff)
downloadscala-b454bbc5a4b615b474bb9860f336fd86346df4cf.tar.gz
scala-b454bbc5a4b615b474bb9860f336fd86346df4cf.tar.bz2
scala-b454bbc5a4b615b474bb9860f336fd86346df4cf.zip
Made Vector the standard impl of IndexedSeq.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/immutable/IndexedSeq.scala2
-rw-r--r--src/library/scala/collection/immutable/Vector.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/collection/immutable/IndexedSeq.scala b/src/library/scala/collection/immutable/IndexedSeq.scala
index 976ed61a65..3f29052808 100644
--- a/src/library/scala/collection/immutable/IndexedSeq.scala
+++ b/src/library/scala/collection/immutable/IndexedSeq.scala
@@ -37,5 +37,5 @@ object IndexedSeq extends SeqFactory[IndexedSeq] {
def apply(idx: Int) = buf.apply(idx)
}
implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, IndexedSeq[A]] = new GenericCanBuildFrom[A]
- def newBuilder[A]: Builder[A, IndexedSeq[A]] = new ArrayBuffer[A] mapResult (buf => new Impl(buf))
+ def newBuilder[A]: Builder[A, IndexedSeq[A]] = Vector.newBuilder[A]
}
diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala
index 0da702f508..6defe66d6f 100644
--- a/src/library/scala/collection/immutable/Vector.scala
+++ b/src/library/scala/collection/immutable/Vector.scala
@@ -34,9 +34,9 @@ object Vector extends SeqFactory[Vector] {
// be carefully chosen to not prevent method inlining
@serializable
-final class Vector[+A](startIndex: Int, endIndex: Int, focus: Int) extends Seq[A]
+final class Vector[+A](startIndex: Int, endIndex: Int, focus: Int) extends IndexedSeq[A]
with GenericTraversableTemplate[A, Vector]
- with SeqLike[A, Vector[A]]
+ with IndexedSeqLike[A, Vector[A]]
with VectorPointer[A @uncheckedVariance] { self =>
override def companion: GenericCompanion[Vector] = Vector