diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-10-21 13:24:41 +0000 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-10-21 13:24:41 +0000 |
commit | f818b44b1c7a4ad62271600d85dc41602a7349f7 (patch) | |
tree | ffd58eb03cb644872ffdbedf4725b147588b2742 /src/library/scala/collection/immutable/Map.scala | |
parent | 70bc8f93c56d6ac2390bbae8a0ab173926240549 (diff) | |
download | scala-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/immutable/Map.scala')
-rw-r--r-- | src/library/scala/collection/immutable/Map.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala index 1f5b35c1c2..e1d0abb928 100644 --- a/src/library/scala/collection/immutable/Map.scala +++ b/src/library/scala/collection/immutable/Map.scala @@ -42,7 +42,7 @@ trait Map[A, +B] extends Iterable[(A, B)] * @since 1 */ object Map extends ImmutableMapFactory[Map] { - implicit def builderFactory[A, B]: BuilderFactory[(A, B), Map[A, B], Coll] = new MapBuilderFactory[A, B] + implicit def canBuildFrom[A, B]: CanBuildFrom[Coll, (A, B), Map[A, B]] = new MapCanBuildFrom[A, B] def empty[A, B]: Map[A, B] = new EmptyMap[A, B] |