summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/mutable/WrappedArray.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2009-10-21 13:24:41 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2009-10-21 13:24:41 +0000
commitf818b44b1c7a4ad62271600d85dc41602a7349f7 (patch)
treeffd58eb03cb644872ffdbedf4725b147588b2742 /src/library/scala/collection/mutable/WrappedArray.scala
parent70bc8f93c56d6ac2390bbae8a0ab173926240549 (diff)
downloadscala-f818b44b1c7a4ad62271600d85dc41602a7349f7.tar.gz
scala-f818b44b1c7a4ad62271600d85dc41602a7349f7.tar.bz2
scala-f818b44b1c7a4ad62271600d85dc41602a7349f7.zip
renamed BuilderFactory[El, To, From] -> CanBuil...
renamed BuilderFactory[El, To, From] -> CanBuildFrom[From, El, To] and added apply() overload to create collections from scratch generically added def apply() overload to BuilderFactory so that we can also create collections from scratch generically (see test test/files/pos/collectGenericCC.scala) renaming: - BuilderFactory[El, To, From] -> CanBuildFrom[From, El, To] bulk type-param reordering using: s/CanBuildFrom\[\s*([^,()\s]*)\s*,(\s+[^\s,()]*)\s*,\s+([^\s,()]*)\s*\]/CanBuildFrom[$3, $1,$2]/ some argument lists got mixed up because they contained 4 comma's... - builderFactory -> canBuildFrom removed explicit implicit value in DocDriver that was renamed renamed collection/generic/BuilderFactory.scala -> collection/generic/CanBuildFrom.scala tested with clean build using ant strap.done -- everything went well on my machine
Diffstat (limited to 'src/library/scala/collection/mutable/WrappedArray.scala')
-rw-r--r--src/library/scala/collection/mutable/WrappedArray.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/library/scala/collection/mutable/WrappedArray.scala b/src/library/scala/collection/mutable/WrappedArray.scala
index f3f5596fd6..4a3d84a303 100644
--- a/src/library/scala/collection/mutable/WrappedArray.scala
+++ b/src/library/scala/collection/mutable/WrappedArray.scala
@@ -65,10 +65,12 @@ object WrappedArray {
case x: Array[Unit] => wrapUnitArray(x).asInstanceOf[WrappedArray[T]]
}
- implicit def builderFactory[T](implicit m: ClassManifest[T]): BuilderFactory[T, WrappedArray[T], WrappedArray[_]] =
- new BuilderFactory[T, WrappedArray[T], WrappedArray[_]] {
+ implicit def canBuildFrom[T](implicit m: ClassManifest[T]): CanBuildFrom[WrappedArray[_], T, WrappedArray[T]] =
+ new CanBuildFrom[WrappedArray[_], T, WrappedArray[T]] {
def apply(from: WrappedArray[_]): Builder[T, WrappedArray[T]] =
ArrayBuilder.make[T]()(m) mapResult WrappedArray.make[T]
+ def apply: Builder[T, WrappedArray[T]] =
+ ArrayBuilder.make[T]()(m) mapResult WrappedArray.make[T]
}
def newBuilder[A]: Builder[A, Vector[A]] = new ArrayBuffer