Fixed the rest of the library deprecation warni...

Fixed the rest of the library deprecation warnings which had clear-ish
resolutions.

4 files changed, 9 insertions, 9 deletions

diff --git a/src/library/scala/collection/generic/MapProxyTemplate.scala b/src/library/scala/collection/generic/MapProxyTemplate.scala
index 6ab3e470ab..ff32c38dc4 100644
--- a/src/library/scala/collection/generic/MapProxyTemplate.scala
+++ b/src/library/scala/collection/generic/MapProxyTemplate.scala
@@ -34,10 +34,10 @@ trait MapProxyTemplate[A, +B, +This <: MapTemplate[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.keys
+  override def keys: Iterator[A] = self.keysIterator
   override def valueIterable: Iterable[B] = self.valueIterable
   override def valuesIterator: Iterator[B] = self.valuesIterator
-  override def values: Iterator[B] = self.values
+  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)
diff --git a/src/library/scala/collection/generic/SequenceProxyTemplate.scala b/src/library/scala/collection/generic/SequenceProxyTemplate.scala
index d3f5c3c9b5..a731239e36 100644
--- a/src/library/scala/collection/generic/SequenceProxyTemplate.scala
+++ b/src/library/scala/collection/generic/SequenceProxyTemplate.scala
@@ -36,7 +36,7 @@ trait SequenceProxyTemplate[+A, +This <: SequenceTemplate[A, This] with Sequence
   override def prefixLength(p: A => Boolean) = self.prefixLength(p)
   override def indexWhere(p: A => Boolean): Int = self.indexWhere(p)
   override def indexWhere(p: A => Boolean, from: Int): Int = self.indexWhere(p, from)
-  override def findIndexOf(p: A => Boolean): Int = self.findIndexOf(p)
+  override def findIndexOf(p: A => Boolean): Int = self.indexWhere(p)
   override def indexOf[B >: A](elem: B): Int = self.indexOf(elem)
   override def indexOf[B >: A](elem: B, from: Int): Int = self.indexOf(elem, from)
   override def lastIndexOf[B >: A](elem: B): Int = self.lastIndexOf(elem)
@@ -59,8 +59,8 @@ trait SequenceProxyTemplate[+A, +This <: SequenceTemplate[A, This] with Sequence
   override def indices: Range = self.indices
   override def view = self.view
   override def view(from: Int, until: Int) = self.view(from, until)
-  override def findLastIndexOf(p: A => Boolean): Int = self.findLastIndexOf(p)
-  override def slice(from: Int): Sequence[A] = self.slice(from)
-  override def equalsWith[B](that: Sequence[B])(f: (A,B) => Boolean): Boolean = self.equalsWith(that)(f)
-  override def containsSlice[B](that: Sequence[B]): Boolean = self.containsSlice(that)
+  override def findLastIndexOf(p: A => Boolean): Int = self.lastIndexWhere(p)
+  override def slice(from: Int): Sequence[A] = self.drop(from)
+  override def equalsWith[B](that: Sequence[B])(f: (A,B) => Boolean): Boolean = (self zip that) forall { case (x,y) => f(x,y) }
+  override def containsSlice[B](that: Sequence[B]): Boolean = self.indexOfSeq(that) != -1
 }
diff --git a/src/library/scala/collection/generic/TraversableProxyTemplate.scala b/src/library/scala/collection/generic/TraversableProxyTemplate.scala
index e27fba086f..b44f6c230d 100644
--- a/src/library/scala/collection/generic/TraversableProxyTemplate.scala
+++ b/src/library/scala/collection/generic/TraversableProxyTemplate.scala
@@ -37,7 +37,7 @@ trait TraversableProxyTemplate[+A, +This <: TraversableTemplate[A, This] with Tr
   override def flatMap[B, That](f: A => Traversable[B])(implicit bf: BuilderFactory[B, That, This]): That = self.flatMap(f)(bf)
   override def filter(p: A => Boolean): This = self.filter(p)
   override def filterNot(p: A => Boolean): This = self.filterNot(p)
-  override def remove(p: A => Boolean): This = self.remove(p)
+  override def remove(p: A => Boolean): This = self.filterNot(p)
   override def partition(p: A => Boolean): (This, This) = self.partition(p)
   override def groupBy[K](f: A => K): Map[K, This] = self.groupBy(f)
   override def forall(p: A => Boolean): Boolean = self.forall(p)
diff --git a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
index 27e7b412e1..c309ce643e 100644
--- a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
+++ b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
@@ -61,7 +61,7 @@ extends Map[A, B]
 
   override def toList: List[(A, B)] = imap.toList
 
-  override def update(key: A, value: B): Unit = { imap = imap.update(key, value) }
+  override def update(key: A, value: B): Unit = { imap = imap.updated(key, value) }
 
   def -= (key: A): this.type = { imap = imap - key; this }