fixed failing testcases due to previous commit ...

fixed failing testcases due to previous commit (renaming of
BuilderFactory)

4 files changed, 10 insertions, 7 deletions

diff --git a/test/files/neg/t2031.check b/test/files/neg/t2031.check
index 1e58fd795c..74aa6c9c0b 100644
--- a/test/files/neg/t2031.check
+++ b/test/files/neg/t2031.check
@@ -1,6 +1,6 @@
 t2031.scala:8: error: polymorphic expression cannot be instantiated to expected type;
  found   : [A]scala.collection.mutable.Builder[A,scala.collection.immutable.TreeSet[A]]
- required: scala.collection.generic.BuilderFactory[Int,?,scala.collection.immutable.TreeSet[Int]]
+ required: scala.collection.generic.CanBuildFrom[scala.collection.immutable.TreeSet[Int],Int,?]
  res0.map(x => x)(TreeSet.newBuilder)
                           ^
 one error found
diff --git a/test/files/pos/collectGenericCC.scala b/test/files/pos/collectGenericCC.scala
index 2873029bb6..9840f1071d 100644
--- a/test/files/pos/collectGenericCC.scala
+++ b/test/files/pos/collectGenericCC.scala
@@ -2,7 +2,7 @@ import scala.collection.generic._
 import scala.collection._
 
 object Test {
-  def collect[A, Res](r: {def foreach[U](k: A => U): Unit})(implicit bf: BuilderFactory[A, Res, Nothing]) = {
+  def collect[A, Res](r: Traversable[A])(implicit bf: CanBuildFrom[Nothing, A, Res]) = {
     val b = bf()
     for (a <- r) b += a
     b.result
diff --git a/test/files/pos/spec-List.scala b/test/files/pos/spec-List.scala
index a68e2774cb..b746eca44b 100644
--- a/test/files/pos/spec-List.scala
+++ b/test/files/pos/spec-List.scala
@@ -144,7 +144,7 @@ sealed abstract class List[@specialized +A] extends LinearSeq[A]
   /** Create a new list which contains all elements of this list
    *  followed by all elements of Traversable `that'
    */
-  override def ++[B >: A, That](that: Traversable[B])(implicit bf: BuilderFactory[B, That, List[A]]): That = {
+  override def ++[B >: A, That](that: Traversable[B])(implicit bf: CanBuildFrom[List[A], B, That]): That = {
     val b = bf(this)
     if (b.isInstanceOf[ListBuffer[_]]) (this ::: that.toList).asInstanceOf[That]
     else super.++(that)
@@ -153,7 +153,7 @@ sealed abstract class List[@specialized +A] extends LinearSeq[A]
   /** Create a new list which contains all elements of this list
    *  followed by all elements of Iterator `that'
    */
-  override def ++[B >: A, That](that: Iterator[B])(implicit bf: BuilderFactory[B, That, List[A]]): That =
+  override def ++[B >: A, That](that: Iterator[B])(implicit bf: CanBuildFrom[List[A], B, That]): That =
     this ++ that.toList
 
   /** Overrides the method in Iterable for efficiency.
@@ -496,7 +496,10 @@ object List extends SeqFactory[List] {
 
   import collection.{Iterable, Seq, Vector}
 
-  implicit def builderFactory[A]: BuilderFactory[A, List[A], Coll] = new VirtualBuilderFactory[A]
+  implicit def builderFactory[A]: CanBuildFrom[Coll, A, List[A]] =
+    new GenericCanBuildFrom[A] {
+      def apply() = newBuilder[A]
+    }
   def newBuilder[A]: Builder[A, List[A]] = new ListBuffer[A]
 
   override def empty[A]: List[A] = Nil
diff --git a/test/files/pos/spec-super.scala b/test/files/pos/spec-super.scala
index e06a126aa4..67179e0230 100644
--- a/test/files/pos/spec-super.scala
+++ b/test/files/pos/spec-super.scala
@@ -3,7 +3,7 @@ import scala.collection.mutable.ListBuffer
 import scala.collection.generic._
 
 trait Base[+A] extends Traversable[A] {
-  def add[B >: A, That](that: Traversable[B])(implicit bf: BuilderFactory[B, That, Base[A]]): That = {
+  def add[B >: A, That](that: Traversable[B])(implicit bf: CanBuildFrom[Base[A], B, That]): That = {
     val b = bf(this)
     b ++= this
     b ++= that
@@ -13,7 +13,7 @@ trait Base[+A] extends Traversable[A] {
 }
 
 abstract class Derived[@specialized +A] extends Base[A] {
-  override def add[B >: A, That](that: Traversable[B])(implicit bf: BuilderFactory[B, That, Base[A]]): That = {
+  override def add[B >: A, That](that: Traversable[B])(implicit bf: CanBuildFrom[Base[A], B, That]): That = {
     val b = bf(this)
     super.add[B, That](that)
   }