Merge pull request scala#793 from jsuereth/fix/convert-to

Renaming convertTo to to on GenTraversableOnce.

Author: jsuereth

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 convertTo[Col[_]]: Col[A]
+   *  @usecase def to[Col[_]]: Col[A]
    *    @inheritdoc
    *    $willNotTerminateInf
    *    @return a new collection containing all elements of this $coll.
    */
-  def convertTo[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV]
+  def to[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV]
 }

src/library/scala/collection/TraversableLike.scala

@@ -617,7 +617,7 @@ trait TraversableLike[+A, +Repr] extends Any
   def toIterator: Iterator[A] = toStream.iterator
   def toStream: Stream[A] = toBuffer.toStream
   // Override to provide size hint.
-  override def convertTo[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV] = {
+  override def to[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV] = {
     val b = cbf()
     b.sizeHint(this)
     b ++= thisCollection

src/library/scala/collection/TraversableOnce.scala

@@ -240,21 +240,21 @@ trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
 
   def toTraversable: Traversable[A]
 
-  def toList: List[A] = convertTo[List]
+  def toList: List[A] = to[List]
 
   def toIterable: Iterable[A] = toStream
 
   def toSeq: Seq[A] = toStream
 
-  def toIndexedSeq: immutable.IndexedSeq[A] = convertTo[immutable.IndexedSeq]
+  def toIndexedSeq: immutable.IndexedSeq[A] = to[immutable.IndexedSeq]
 
-  def toBuffer[B >: A]: mutable.Buffer[B] = convertTo[ArrayBuffer].asInstanceOf[mutable.Buffer[B]]
+  def toBuffer[B >: A]: mutable.Buffer[B] = to[ArrayBuffer].asInstanceOf[mutable.Buffer[B]]
 
-  def toSet[B >: A]: immutable.Set[B] = convertTo[immutable.Set].asInstanceOf[immutable.Set[B]]
+  def toSet[B >: A]: immutable.Set[B] = to[immutable.Set].asInstanceOf[immutable.Set[B]]
 
-  def toVector: Vector[A] = convertTo[Vector]
+  def toVector: Vector[A] = to[Vector]
 
-  def convertTo[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV] = {
+  def to[Col[_]](implicit cbf: CanBuildFrom[Nothing, A, Col[A @uV]]): Col[A @uV] = {
     val b = cbf()
     b ++= seq
     b.result

src/library/scala/collection/parallel/ParIterableLike.scala

@@ -851,11 +851,11 @@ self: ParIterableLike[T, Repr, Sequential] =>
 
   override def toMap[K, V](implicit ev: T <:< (K, V)): immutable.ParMap[K, V] = toParMap[K, V, immutable.ParMap[K, V]](() => immutable.ParMap.newCombiner[K, V])
 
-  override def toVector: Vector[T] = convertTo[Vector]
+  override def toVector: Vector[T] = to[Vector]
 
-  override def convertTo[Col[_]](implicit cbf: CanBuildFrom[Nothing, T, Col[T @uncheckedVariance]]): Col[T @uncheckedVariance] = if (cbf().isCombiner) {
+  override def to[Col[_]](implicit cbf: CanBuildFrom[Nothing, T, Col[T @uncheckedVariance]]): Col[T @uncheckedVariance] = if (cbf().isCombiner) {
     toParCollection[T, Col[T]](() => cbf().asCombiner)
-  } else seq.convertTo(cbf)
+  } else seq.to(cbf)
 
   /* tasks */
 

test/files/pos/t5953.scala

@@ -10,7 +10,7 @@ package object foo {
 
 package foo {
   object Test {
-    def f1[T](xs: Traversable[T]) = xs.convertTo[immutable.Vector]
+    def f1[T](xs: Traversable[T]) = xs.to[immutable.Vector]
     def f2[T](xs: Traversable[T]) = xs.build[immutable.Vector]
   }
 }

test/files/presentation/ide-bug-1000531.check

@@ -25,7 +25,6 @@ retrieved 126 members
 [accessible:  true] `method collectFirst[B](pf: PartialFunction[B,B])Option[B]`
 [accessible:  true] `method collect[B](pf: PartialFunction[B,B])Iterator[B]`
 [accessible:  true] `method contains(elem: Any)Boolean`
-[accessible:  true] `method convertTo[Col[_]](implicit cbf: scala.collection.generic.CanBuildFrom[Nothing,B,Col[B]])Col[B]`
 [accessible:  true] `method copyToArray[B >: B](xs: Array[B])Unit`
 [accessible:  true] `method copyToArray[B >: B](xs: Array[B], start: Int)Unit`
 [accessible:  true] `method copyToArray[B >: B](xs: Array[B], start: Int, len: Int)Unit`
@@ -111,6 +110,7 @@ retrieved 126 members
 [accessible:  true] `method toString()String`
 [accessible:  true] `method toTraversable=> Traversable[B]`
 [accessible:  true] `method toVector=> Vector[B]`
+[accessible:  true] `method to[Col[_]](implicit cbf: scala.collection.generic.CanBuildFrom[Nothing,B,Col[B]])Col[B]`
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`

test/files/run/collection-conversions.scala

@@ -36,18 +36,18 @@ object Test {
     val tmp = col
     println("-- Testing " + name + " ---")
     printResult("[Direct] Vector   ", col.toVector, testVector)
-    printResult("[Copy]   Vector   ", col.convertTo[Vector], testVector)
+    printResult("[Copy]   Vector   ", col.to[Vector], testVector)
     printResult("[Direct] Buffer   ", col.toBuffer, testBuffer)
-    printResult("[Copy]   Buffer   ", col.convertTo[Buffer], testBuffer)
+    printResult("[Copy]   Buffer   ", col.to[Buffer], testBuffer)
     printResult("[Direct] GenSeq   ", col.toSeq, testGenSeq)
-    printResult("[Copy]   GenSeq   ", col.convertTo[GenSeq], testGenSeq)
-    printResult("[Copy]   Seq      ", col.convertTo[Seq], testSeq)
+    printResult("[Copy]   GenSeq   ", col.to[GenSeq], testGenSeq)
+    printResult("[Copy]   Seq      ", col.to[Seq], testSeq)
     printResult("[Direct] Stream   ", col.toStream, testStream)
-    printResult("[Copy]   Stream   ", col.convertTo[Stream], testStream)
+    printResult("[Copy]   Stream   ", col.to[Stream], testStream)
     printResult("[Direct] Array    ", col.toArray, testArray)
-    printResult("[Copy]   Array    ", col.convertTo[Array], testArray)
-    printResult("[Copy]   ParVector", col.convertTo[ParVector], testParVector)
-    printResult("[Copy]   ParArray ", col.convertTo[ParArray], testParArray)
+    printResult("[Copy]   Array    ", col.to[Array], testArray)
+    printResult("[Copy]   ParVector", col.to[ParVector], testParVector)
+    printResult("[Copy]   ParArray ", col.to[ParArray], testParArray)
   }
 
   def main(args: Array[String]): Unit = {