From b454bbc5a4b615b474bb9860f336fd86346df4cf Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 5 Apr 2010 16:53:53 +0000 Subject: Made Vector the standard impl of IndexedSeq. --- src/library/scala/collection/immutable/IndexedSeq.scala | 2 +- src/library/scala/collection/immutable/Vector.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/library') 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 -- cgit v1.2.3