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

Renaming convertTo to to on GenTraversableOnce.

3 files changed, 10 insertions, 10 deletions

diff --git a/test/files/pos/t5953.scala b/test/files/pos/t5953.scala
index 90e7d84646..7ba035ec3b 100644
--- a/test/files/pos/t5953.scala
+++ b/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]
   }
 }
diff --git a/test/files/presentation/ide-bug-1000531.check b/test/files/presentation/ide-bug-1000531.check
index 9d4674d7c7..4be98a6b21 100644
--- a/test/files/presentation/ide-bug-1000531.check
+++ b/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`
diff --git a/test/files/run/collection-conversions.scala b/test/files/run/collection-conversions.scala
index 6d90caee4b..d842742230 100644
--- a/test/files/run/collection-conversions.scala
+++ b/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 = {