From 621da8e1ff8cebfada253e287b8f41bbd3eb8e23 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Tue, 3 Nov 2009 11:04:19 +0000 Subject: fixed #2500 (second part) missed some compile errors because I didn't do a full recompile... --- src/library/scala/collection/Map.scala | 2 +- src/library/scala/collection/SortedMap.scala | 2 +- src/library/scala/collection/SortedSet.scala | 2 +- src/library/scala/collection/generic/MutableMapFactory.scala | 5 +---- src/library/scala/collection/immutable/TreeSet.scala | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala index f947e4e5da..cf140ce672 100644 --- a/src/library/scala/collection/Map.scala +++ b/src/library/scala/collection/Map.scala @@ -49,7 +49,7 @@ trait Map[A, +B] extends Iterable[(A, B)] with MapLike[A, B, Map[A, B]] { * @since 2.5 */ object Map extends MapFactory[Map] { - def empty[A, B]: Map[A, B] = immutable.Map.empty + def empty[A, B]: immutable.Map[A, B] = immutable.Map.empty implicit def canBuildFrom[A, B]: CanBuildFrom[Coll, (A, B), Map[A, B]] = new MapCanBuildFrom[A, B] } diff --git a/src/library/scala/collection/SortedMap.scala b/src/library/scala/collection/SortedMap.scala index 611f6ed013..692cf670e6 100644 --- a/src/library/scala/collection/SortedMap.scala +++ b/src/library/scala/collection/SortedMap.scala @@ -31,7 +31,7 @@ trait SortedMap[A, +B] extends Map[A, B] with SortedMapLike[A, B, SortedMap[A, B * @since 2.8 */ object SortedMap extends SortedMapFactory[SortedMap] { - def empty[A, B](implicit ord: Ordering[A]): SortedMap[A, B] = immutable.SortedMap.empty[A, B](ord) + def empty[A, B](implicit ord: Ordering[A]): immutable.SortedMap[A, B] = immutable.SortedMap.empty[A, B](ord) implicit def canBuildFrom[A, B](implicit ord: Ordering[A]): CanBuildFrom[Coll, (A, B), SortedMap[A, B]] = new SortedMapCanBuildFrom[A, B] } diff --git a/src/library/scala/collection/SortedSet.scala b/src/library/scala/collection/SortedSet.scala index ab988e39ad..7d18bf79a9 100644 --- a/src/library/scala/collection/SortedSet.scala +++ b/src/library/scala/collection/SortedSet.scala @@ -27,7 +27,7 @@ trait SortedSet[A] extends Set[A] with SortedSetLike[A, SortedSet[A]] { * @since 2.8 */ object SortedSet extends SortedSetFactory[SortedSet] { - def empty[A](implicit ord: Ordering[A]): SortedSet[A] = immutable.SortedSet.empty[A](ord) + def empty[A](implicit ord: Ordering[A]): immutable.SortedSet[A] = immutable.SortedSet.empty[A](ord) implicit def canBuildFrom[A](implicit ord: Ordering[A]): CanBuildFrom[Coll, A, SortedSet[A]] = new SortedSetCanBuildFrom[A] } diff --git a/src/library/scala/collection/generic/MutableMapFactory.scala b/src/library/scala/collection/generic/MutableMapFactory.scala index e7aaa5e68b..603e447453 100644 --- a/src/library/scala/collection/generic/MutableMapFactory.scala +++ b/src/library/scala/collection/generic/MutableMapFactory.scala @@ -19,7 +19,4 @@ import mutable.MapBuilder * @since 2.8 */ abstract class MutableMapFactory[CC[A, B] <: mutable.Map[A, B] with mutable.MapLike[A, B, CC[A, B]]] - extends MapFactory[CC] { - - def newBuilder[A, B] = new MapBuilder[A, B, CC[A, B]](empty[A, B]) -} + extends MapFactory[CC] diff --git a/src/library/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala index 80c12e1c93..3600392d7c 100644 --- a/src/library/scala/collection/immutable/TreeSet.scala +++ b/src/library/scala/collection/immutable/TreeSet.scala @@ -22,7 +22,7 @@ import mutable.{Builder, AddingBuilder} object TreeSet extends SortedSetFactory[TreeSet]{ implicit def implicitBuilder[A](implicit ordering: Ordering[A]): Builder[A, TreeSet[A]] = newBuilder[A](ordering) - def newBuilder[A](implicit ordering: Ordering[A]): Builder[A, TreeSet[A]] = + override def newBuilder[A](implicit ordering: Ordering[A]): Builder[A, TreeSet[A]] = new AddingBuilder(empty[A](ordering)) /** The empty set of this type -- cgit v1.2.3