summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-07-03 11:05:50 +0200
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-07-03 11:05:50 +0200
commit6a1e59257136ff15c6f8a94fbc80ddfbf0a7402f (patch)
tree5e8ae3ad44c823ebc68cfb9cdccfb166038e462a /src
parentdd36e574439adb2fe13b22f5927d681918ad5be6 (diff)
parent1f53a0d180a1fa561502f3d7884d71daf998a837 (diff)
downloadscala-6a1e59257136ff15c6f8a94fbc80ddfbf0a7402f.tar.gz
scala-6a1e59257136ff15c6f8a94fbc80ddfbf0a7402f.tar.bz2
scala-6a1e59257136ff15c6f8a94fbc80ddfbf0a7402f.zip
Merge pull request #3834 from Ichoran/issue/7577
SI-7577 Incorrect documentation: current default isn't Vector
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/Iterable.scala2
-rw-r--r--src/library/scala/collection/Traversable.scala2
-rw-r--r--src/library/scala/collection/immutable/Iterable.scala1
-rw-r--r--src/library/scala/collection/immutable/Traversable.scala2
4 files changed, 4 insertions, 3 deletions
diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala
index a5ab8efd5c..afbffd36c6 100644
--- a/src/library/scala/collection/Iterable.scala
+++ b/src/library/scala/collection/Iterable.scala
@@ -38,7 +38,7 @@ trait Iterable[+A] extends Traversable[A]
}
/** $factoryInfo
- * The current default implementation of a $Coll is a `Vector`.
+ * The current default implementation of a $Coll is a `List`.
* @define coll iterable collection
* @define Coll `Iterable`
*/
diff --git a/src/library/scala/collection/Traversable.scala b/src/library/scala/collection/Traversable.scala
index b53724c568..a35750a35f 100644
--- a/src/library/scala/collection/Traversable.scala
+++ b/src/library/scala/collection/Traversable.scala
@@ -87,7 +87,7 @@ trait Traversable[+A] extends TraversableLike[A, Traversable[A]]
}
/** $factoryInfo
- * The current default implementation of a $Coll is a `Vector`.
+ * The current default implementation of a $Coll is a `List`.
*/
object Traversable extends TraversableFactory[Traversable] { self =>
diff --git a/src/library/scala/collection/immutable/Iterable.scala b/src/library/scala/collection/immutable/Iterable.scala
index 6e4eb1e45f..df322396d0 100644
--- a/src/library/scala/collection/immutable/Iterable.scala
+++ b/src/library/scala/collection/immutable/Iterable.scala
@@ -35,6 +35,7 @@ trait Iterable[+A] extends Traversable[A]
}
/** $factoryInfo
+ * The current default implementation of a $Coll is a `List`.
* @define Coll `immutable.Iterable`
* @define coll immutable iterable collection
*/
diff --git a/src/library/scala/collection/immutable/Traversable.scala b/src/library/scala/collection/immutable/Traversable.scala
index 775d635fae..5fc0607a00 100644
--- a/src/library/scala/collection/immutable/Traversable.scala
+++ b/src/library/scala/collection/immutable/Traversable.scala
@@ -29,7 +29,7 @@ trait Traversable[+A] extends scala.collection.Traversable[A]
}
/** $factoryInfo
- * The current default implementation of a $Coll is a `Vector`.
+ * The current default implementation of a $Coll is a `List`.
* @define coll immutable traversable collection
* @define Coll `immutable.Traversable`
*/