summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/Map.scala
diff options
context:
space:
mode:
authorstepancheg <stepancheg@epfl.ch>2009-09-26 15:19:40 +0000
committerstepancheg <stepancheg@epfl.ch>2009-09-26 15:19:40 +0000
commitcecae470906a19a0ad405940dd48e62fcbbdab49 (patch)
treedd605b6e5ea23142daaa496101e8775ae0fbfb89 /src/library/scala/collection/Map.scala
parent2a5664146d7fa932c09ae6ac035748ada269e54e (diff)
downloadscala-cecae470906a19a0ad405940dd48e62fcbbdab49.tar.gz
scala-cecae470906a19a0ad405940dd48e62fcbbdab49.tar.bz2
scala-cecae470906a19a0ad405940dd48e62fcbbdab49.zip
more @since annotations
Diffstat (limited to 'src/library/scala/collection/Map.scala')
-rw-r--r--src/library/scala/collection/Map.scala7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala
index 309c529f6f..3da7a3fcac 100644
--- a/src/library/scala/collection/Map.scala
+++ b/src/library/scala/collection/Map.scala
@@ -37,12 +37,17 @@ import generic._
*
* @note Of you additions and mutations return the same kind of map as the map
* you are defining, you should inherit from <code>MapLike</code> as well.
+ *
+ * @since 1
*/
trait Map[A, +B] extends Iterable[(A, B)] with MapLike[A, B, Map[A, B]] {
def empty: Map[A, B] = Map.empty
}
-/* Factory object for `Map` class */
+/* Factory object for `Map` class
+ *
+ * @since 2.5
+ */
object Map extends ImmutableMapFactory[immutable.Map] {
def empty[A, B]: immutable.Map[A, B] = immutable.Map.empty
implicit def builderFactory[A, B]: BuilderFactory[(A, B), Map[A, B], Coll] = new MapBuilderFactory[A, B]