- toString() on large collections now only prints

  a few of the elements
- all maps now have getOrElse
- mutable maps now have getOrElsePut

1 files changed, 10 insertions, 3 deletions

diff --git a/src/library/scala/collection/Set.scala b/src/library/scala/collection/Set.scala
index 94cb1d9256..58e9640704 100644
--- a/src/library/scala/collection/Set.scala
+++ b/src/library/scala/collection/Set.scala
@@ -93,8 +93,15 @@ trait Set[A] extends (A => Boolean) with Iterable[A] {
 
   /** Returns a string representation of this set.
    *
-   *  @return a string showing all elements of this set.
+   *  @return a string showing all elements of this set, or a subset
+   *     of them if the set is large.
    */
-  override def toString(): String = mkString("Set(", ", ", ")")
-
+  override def toString(): String =
+    if(size <= 20)
+      mkString("Set(", ", ", ")")
+    else {
+      val topr = 2
+      elements.take(topr).mkString("Set(", ", ",
+          (", and " + (size - topr) + " more...)"))
+    }
 }