Fix for #2525.

5 files changed, 5 insertions, 5 deletions

diff --git a/src/library/scala/collection/MapLike.scala b/src/library/scala/collection/MapLike.scala
index 19288323e8..3b188acab6 100644
--- a/src/library/scala/collection/MapLike.scala
+++ b/src/library/scala/collection/MapLike.scala
@@ -155,7 +155,7 @@ self =>
 
   /** @return the values of this map as an iterable.
    */
-  def valueIterable: Iterable[B] = new DefaultValuesIterable
+  def valuesIterable: Iterable[B] = new DefaultValuesIterable
 
   protected class DefaultValuesIterable extends Iterable[B] {
     def iterator = self.iterator.map(_._2)
diff --git a/src/library/scala/collection/MapProxyLike.scala b/src/library/scala/collection/MapProxyLike.scala
index 699a876f15..88c79c0865 100644
--- a/src/library/scala/collection/MapProxyLike.scala
+++ b/src/library/scala/collection/MapProxyLike.scala
@@ -37,7 +37,7 @@ trait MapProxyLike[A, +B, +This <: MapLike[A, B, This] with Map[A, B]]
   override def keySet: Set[A] = self.keySet
   override def keysIterator: Iterator[A] = self.keysIterator
   override def keys: Iterator[A] = self.keysIterator
-  override def valueIterable: Iterable[B] = self.valueIterable
+  override def valuesIterable: Iterable[B] = self.valuesIterable
   override def valuesIterator: Iterator[B] = self.valuesIterator
   override def values: Iterator[B] = self.valuesIterator
   override def default(key: A): B = self.default(key)
diff --git a/src/library/scala/collection/interfaces/MapMethods.scala b/src/library/scala/collection/interfaces/MapMethods.scala
index f8c20366b8..74c4229d3d 100644
--- a/src/library/scala/collection/interfaces/MapMethods.scala
+++ b/src/library/scala/collection/interfaces/MapMethods.scala
@@ -32,7 +32,7 @@ with SubtractableMethods[A, This]
   def isDefinedAt(key: A): Boolean
   def keySet: Set[A]
   def keysIterator: Iterator[A]
-  def valueIterable: Iterable[B]
+  def valuesIterable: Iterable[B]
   def valuesIterator: Iterator[B]
   def default(key: A): B
   def filterKeys(p: A => Boolean): DefaultMap[A, B]
diff --git a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
index 263c4caddf..69da34f5be 100644
--- a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
+++ b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
@@ -48,7 +48,7 @@ extends Map[A, B]
   @deprecated("use `keysIterator' instead")
   override def keys: Iterator[A] = imap.keysIterator
 
-  override def valueIterable: scala.collection.Iterable[B] = imap.valueIterable
+  override def valuesIterable: scala.collection.Iterable[B] = imap.valuesIterable
 
   override def valuesIterator: Iterator[B] = imap.valuesIterator
 
diff --git a/src/library/scala/collection/mutable/SynchronizedMap.scala b/src/library/scala/collection/mutable/SynchronizedMap.scala
index d1455a30e5..650c939936 100644
--- a/src/library/scala/collection/mutable/SynchronizedMap.scala
+++ b/src/library/scala/collection/mutable/SynchronizedMap.scala
@@ -35,7 +35,7 @@ trait SynchronizedMap[A, B] extends Map[A, B] {
   override def getOrElseUpdate(key: A, default: => B): B = synchronized { super.getOrElseUpdate(key, default) }
   override def transform(f: (A, B) => B): this.type = synchronized[this.type] { super.transform(f) }
   override def retain(p: (A, B) => Boolean): this.type = synchronized[this.type] { super.retain(p) }
-  override def valueIterable: scala.collection.Iterable[B] = synchronized { super.valueIterable }
+  override def valuesIterable: scala.collection.Iterable[B] = synchronized { super.valuesIterable }
   @deprecated("Use `valuesIterator' instead") override def values: Iterator[B] = synchronized { super.valuesIterator }
   override def valuesIterator: Iterator[B] = synchronized { super.valuesIterator }
   override def clone() = synchronized { super.clone() }