diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-10-22 11:58:42 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-10-22 11:58:42 +0000 |
| commit | 1f1cce45879e1b2da988d772761458b48a9111c5 (patch) | |
| tree | ca6abf1b3adf5172873bd470eba767dc45242b80 | |
| parent | 5f43e70e1c528e83d346535af0646849d0951270 (diff) | |
| download | scala-1f1cce45879e1b2da988d772761458b48a9111c5.tar.gz scala-1f1cce45879e1b2da988d772761458b48a9111c5.tar.bz2 scala-1f1cce45879e1b2da988d772761458b48a9111c5.zip | |
Revert "added CanBuild type alias in package ob...
Revert "added CanBuild type alias in package object scala.collection.generic" because it broke scaladoc (I consider that a bug -- filing ticket)
This reverts commit 5b3ba1c27cdce76d8aef2bfb9aa5a836237521a9.
| -rw-r--r-- | src/library/scala/collection/generic/package.scala | 6 | ||||
| -rw-r--r-- | test/files/pos/collectGenericCC.scala | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/library/scala/collection/generic/package.scala b/src/library/scala/collection/generic/package.scala deleted file mode 100644 index 0457fef227..0000000000 --- a/src/library/scala/collection/generic/package.scala +++ /dev/null @@ -1,6 +0,0 @@ -package scala.collection -import generic.CanBuildFrom - -package object generic { - type CanBuild[-Elem, +To] = CanBuildFrom[Nothing, Elem, To] -}
\ No newline at end of file diff --git a/test/files/pos/collectGenericCC.scala b/test/files/pos/collectGenericCC.scala index 3d993dabd0..0195993154 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: Traversable[A])(implicit bf: CanBuild[A, Res]) = { + def collect[A, Res](r: Traversable[A])(implicit bf: CanBuildFrom[Nothing, A, Res]) = { val b = bf() for (a <- r) b += a b.result |