Leveraged -Xmigration to burn off some warts wh...

Leveraged -Xmigration to burn off some warts which arose in the new
collections. Warnings put in place for behavioral changes, allowing the
following. 1) Buffers: create new collections on

++ and -- like all the other collections.  2) Maps: eliminated
never-shipped redundant method valuesIterable and supplied these
return types:

  def keys: Iterable[A]
  def keysIterator: Iterator[A]
  def values: Iterable[B]
  def valuesIterator: Iterator[B]
  def keySet: Set[A]

I concluded that keys should return Iterable because keySet also exists
on Map, and is not solely in the province of Maps even if we wanted to
change it: it's defined on Sorted and also appears in some Sets. So it
seems sensible to have keySet return a Set and keys return the more
general type.

Closes #3089, #3145.  Review by odersky.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/library/scala/collection/MapProxyLike.scala b/src/library/scala/collection/MapProxyLike.scala
index 427eaa6e2c..f269a368dd 100644
--- a/src/library/scala/collection/MapProxyLike.scala
+++ b/src/library/scala/collection/MapProxyLike.scala
@@ -36,10 +36,9 @@ trait MapProxyLike[A, +B, +This <: MapLike[A, B, This] with Map[A, B]]
   override def isDefinedAt(key: A) = self.isDefinedAt(key)
   override def keySet: Set[A] = self.keySet
   override def keysIterator: Iterator[A] = self.keysIterator
-  override def keys: Iterator[A] = self.keysIterator
-  override def valuesIterable: Iterable[B] = self.valuesIterable
+  override def keys: Iterable[A] = self.keys
+  override def values: Iterable[B] = self.values
   override def valuesIterator: Iterator[B] = self.valuesIterator
-  override def values: Iterator[B] = self.valuesIterator
   override def default(key: A): B = self.default(key)
   override def filterKeys(p: A => Boolean) = self.filterKeys(p)
   override def mapValues[C](f: B => C) = self.mapValues(f)