diff options
Diffstat (limited to 'src/library/scala/collection/immutable/Map.scala')
| -rw-r--r-- | src/library/scala/collection/immutable/Map.scala | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala index 272caec5ea..5a6b1be3d5 100644 --- a/src/library/scala/collection/immutable/Map.scala +++ b/src/library/scala/collection/immutable/Map.scala @@ -66,8 +66,7 @@ object Map extends ImmutableMapFactory[Map] { override def withDefaultValue[B1 >: B](d: B1): immutable.Map[A, B1] = new WithDefault[A, B1](underlying, x => d) } - @serializable - private object EmptyMap extends Map[Any, Nothing] { + private object EmptyMap extends Map[Any, Nothing] with Serializable { override def size: Int = 0 def get(key: Any): Option[Nothing] = None def iterator: Iterator[(Any, Nothing)] = Iterator.empty @@ -76,8 +75,8 @@ object Map extends ImmutableMapFactory[Map] { def - (key: Any): Map[Any, Nothing] = this } - @serializable @deprecated("use `Map.empty' instead") - class EmptyMap[A,B] extends Map[A,B] { + @deprecated("use `Map.empty' instead") + class EmptyMap[A,B] extends Map[A,B] with Serializable { override def size: Int = 0 def get(key: A): Option[B] = None def iterator: Iterator[(A, B)] = Iterator.empty @@ -86,8 +85,7 @@ object Map extends ImmutableMapFactory[Map] { def - (key: A): Map[A, B] = this } - @serializable - class Map1[A, +B](key1: A, value1: B) extends Map[A, B] { + class Map1[A, +B](key1: A, value1: B) extends Map[A, B] with Serializable { override def size = 1 def get(key: A): Option[B] = if (key == key1) Some(value1) else None @@ -103,8 +101,7 @@ object Map extends ImmutableMapFactory[Map] { } } - @serializable - class Map2[A, +B](key1: A, value1: B, key2: A, value2: B) extends Map[A, B] { + class Map2[A, +B](key1: A, value1: B, key2: A, value2: B) extends Map[A, B] with Serializable { override def size = 2 def get(key: A): Option[B] = if (key == key1) Some(value1) @@ -125,8 +122,7 @@ object Map extends ImmutableMapFactory[Map] { } } - @serializable - class Map3[A, +B](key1: A, value1: B, key2: A, value2: B, key3: A, value3: B) extends Map[A, B] { + class Map3[A, +B](key1: A, value1: B, key2: A, value2: B, key3: A, value3: B) extends Map[A, B] with Serializable { override def size = 3 def get(key: A): Option[B] = if (key == key1) Some(value1) @@ -150,8 +146,7 @@ object Map extends ImmutableMapFactory[Map] { } } - @serializable - class Map4[A, +B](key1: A, value1: B, key2: A, value2: B, key3: A, value3: B, key4: A, value4: B) extends Map[A, B] { + class Map4[A, +B](key1: A, value1: B, key2: A, value2: B, key3: A, value3: B, key4: A, value4: B) extends Map[A, B] with Serializable { override def size = 4 def get(key: A): Option[B] = if (key == key1) Some(value1) |