summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2012-06-18 12:59:33 -0400
committerJosh Suereth <joshua.suereth@gmail.com>2012-06-18 12:59:33 -0400
commitbc3b1e2c9453ef90f6fb7aaa3dea6e24ba19d017 (patch)
treea4b4b55a57a50c0a5986cbb63e898eb7801184ac
parentde6519952582a74a3f9769b1dbde26c617a819f1 (diff)
downloadscala-bc3b1e2c9453ef90f6fb7aaa3dea6e24ba19d017.tar.gz
scala-bc3b1e2c9453ef90f6fb7aaa3dea6e24ba19d017.tar.bz2
scala-bc3b1e2c9453ef90f6fb7aaa3dea6e24ba19d017.zip
Rename copyTo to build based on consensus of 3
-rw-r--r--src/library/scala/collection/GenTraversableOnce.scala4
-rw-r--r--src/library/scala/collection/Iterator.scala4
-rw-r--r--src/library/scala/collection/TraversableLike.scala4
-rw-r--r--src/library/scala/collection/parallel/ParIterableLike.scala2
-rw-r--r--test/files/run/collection-conversions.scala14
5 files changed, 14 insertions, 14 deletions
diff --git a/src/library/scala/collection/GenTraversableOnce.scala b/src/library/scala/collection/GenTraversableOnce.scala
index 2996071d71..46be27f1cd 100644
--- a/src/library/scala/collection/GenTraversableOnce.scala
+++ b/src/library/scala/collection/GenTraversableOnce.scala
@@ -565,10 +565,10 @@ trait GenTraversableOnce[+A] extends Any {
* @tparam Col The collection type to build.
* @return a new collection containing all elements of this $coll.
*
- * @usecase def copyTo[Col[_]]: Col[A]
+ * @usecase def build[Col[_]]: Col[A]
* @inheritdoc
* $willNotTerminateInf
* @return a new collection containing all elements of this $coll.
*/
- def copyTo[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV]
+ def build[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV]
}
diff --git a/src/library/scala/collection/Iterator.scala b/src/library/scala/collection/Iterator.scala
index 4283120519..6b96c8dba5 100644
--- a/src/library/scala/collection/Iterator.scala
+++ b/src/library/scala/collection/Iterator.scala
@@ -1141,8 +1141,8 @@ trait Iterator[+A] extends TraversableOnce[A] {
if (self.hasNext) Stream.cons(self.next, self.toStream)
else Stream.empty[A]
- def toVector: Vector[A] = copyTo[Vector]
- def copyTo[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV] = {
+ def toVector: Vector[A] = build[Vector]
+ def build[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV] = {
val b = cbf()
while(hasNext) b += next
b.result
diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala
index 68abc36bf7..e2e9195f4d 100644
--- a/src/library/scala/collection/TraversableLike.scala
+++ b/src/library/scala/collection/TraversableLike.scala
@@ -616,8 +616,8 @@ trait TraversableLike[+A, +Repr] extends Any
def toTraversable: Traversable[A] = thisCollection
def toIterator: Iterator[A] = toStream.iterator
def toStream: Stream[A] = toBuffer.toStream
- def toVector: Vector[A] = copyTo[Vector]
- def copyTo[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV] = {
+ def toVector: Vector[A] = build[Vector]
+ def build[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV] = {
val b = cbf()
b.sizeHint(this)
b ++= thisCollection
diff --git a/src/library/scala/collection/parallel/ParIterableLike.scala b/src/library/scala/collection/parallel/ParIterableLike.scala
index 12b777832e..20d0a65a4c 100644
--- a/src/library/scala/collection/parallel/ParIterableLike.scala
+++ b/src/library/scala/collection/parallel/ParIterableLike.scala
@@ -853,7 +853,7 @@ self: ParIterableLike[T, Repr, Sequential] =>
override def toVector: Vector[T] = seq.toVector
- override def copyTo[Col[_]](implicit cbf: CanBuildFrom[Nothing, T, Col[T @uncheckedVariance]]): Col[T @uncheckedVariance] = seq.copyTo[Col]
+ override def build[Col[_]](implicit cbf: CanBuildFrom[Nothing, T, Col[T @uncheckedVariance]]): Col[T @uncheckedVariance] = seq.build[Col]
/* tasks */
diff --git a/test/files/run/collection-conversions.scala b/test/files/run/collection-conversions.scala
index 390ba06dac..d7fcbb352a 100644
--- a/test/files/run/collection-conversions.scala
+++ b/test/files/run/collection-conversions.scala
@@ -34,17 +34,17 @@ object Test {
val tmp = col
println("-- Testing " + name + " ---")
printResult("[Direct] Vector ", col.toVector, testVector)
- printResult("[Copy] Vector ", col.copyTo[Vector], testVector)
+ printResult("[Copy] Vector ", col.build[Vector], testVector)
printResult("[Direct] Buffer ", col.toBuffer, testBuffer)
- printResult("[Copy] Buffer ", col.copyTo[Buffer], testBuffer)
+ printResult("[Copy] Buffer ", col.build[Buffer], testBuffer)
printResult("[Direct] GenSeq ", col.toSeq, testGenSeq)
- printResult("[Copy] GenSeq ", col.copyTo[GenSeq], testGenSeq)
- printResult("[Copy] Seq ", col.copyTo[Seq], testSeq)
+ printResult("[Copy] GenSeq ", col.build[GenSeq], testGenSeq)
+ printResult("[Copy] Seq ", col.build[Seq], testSeq)
printResult("[Direct] Stream ", col.toStream, testStream)
- printResult("[Copy] Stream ", col.copyTo[Stream], testStream)
+ printResult("[Copy] Stream ", col.build[Stream], testStream)
printResult("[Direct] Array ", col.toArray, testArray)
- printResult("[Copy] Array ", col.copyTo[Array], testArray)
- printResult("[Copy] ParVector", col.copyTo[ParVector], testParVector)
+ printResult("[Copy] Array ", col.build[Array], testArray)
+ printResult("[Copy] ParVector", col.build[ParVector], testParVector)
}
def main(args: Array[String]): Unit = {