Deprecated "elements" method moved to "Iterable...

Deprecated "elements" method moved to "Iterable" were it belongs.

13 files changed, 2 insertions, 34 deletions

diff --git a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
index 4267b5c95e..382544bd0c 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
@@ -92,8 +92,6 @@ trait BasicBlocks {
     def iterator: Iterator[Instruction] =
       if (closed) instrs.iterator else instructionList.reverse.iterator
 
-    @deprecated def elements = iterator
-
     /** return the underlying array of instructions */
     def getArray: Array[Instruction] = {
       assert(closed)
diff --git a/src/compiler/scala/tools/nsc/io/AbstractFile.scala b/src/compiler/scala/tools/nsc/io/AbstractFile.scala
index 169c230c69..7414a6ca27 100644
--- a/src/compiler/scala/tools/nsc/io/AbstractFile.scala
+++ b/src/compiler/scala/tools/nsc/io/AbstractFile.scala
@@ -153,8 +153,6 @@ abstract class AbstractFile extends AnyRef with Iterable[AbstractFile] {
   /** Returns all abstract subfiles of this abstract directory. */
   def iterator: Iterator[AbstractFile]
 
-  @deprecated def elements = iterator
-
   /** Returns the abstract file in this abstract directory with the specified
    *  name. If there is no such file, returns <code>null</code>. The argument
    *  <code>directory</code> tells whether to look for a directory or
diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala
index 0d7ea28b76..1e6411bdeb 100644
--- a/src/dbc/scala/dbc/result/Relation.scala
+++ b/src/dbc/scala/dbc/result/Relation.scala
@@ -79,6 +79,4 @@ abstract class Relation extends AnyRef with Iterable[Tuple] {
     }
   }
 
-  @deprecated def elements = iterator
-
 }
diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index 968329614c..b118529f00 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -324,20 +324,17 @@ object JavaConversions {
 
   case class IterableWrapper[A](underlying : Iterable[A]) extends ju.AbstractCollection[A] {
     def iterator = underlying.iterator
-	@deprecated def elements = iterator
     def size = underlying.size
     override def isEmpty = underlying.isEmpty
   }
 
   case class JIterableWrapper[A](underlying : jl.Iterable[A]) extends Iterable[A] {
     def iterator = underlying.iterator
-	@deprecated def elements = iterator
     def newBuilder[B] = new mutable.ArrayBuffer[B]
   }
 
   case class JCollectionWrapper[A](underlying : ju.Collection[A]) extends Iterable[A] {
     def iterator = underlying.iterator
-	@deprecated def elements = iterator
     override def size = underlying.size
     override def isEmpty = underlying.isEmpty
     def newBuilder[B] = new mutable.ArrayBuffer[B]
@@ -355,7 +352,6 @@ object JavaConversions {
     def length = underlying.size
     override def isEmpty = underlying.isEmpty
     override def iterator : Iterator[A] = underlying.iterator
-    @deprecated def elements = iterator
     def apply(i : Int) = underlying.get(i)
     def update(i : Int, elem : A) = underlying.set(i, elem)
     def +:(elem : A) = { underlying.subList(0, 0).add(elem) ; this }
@@ -389,14 +385,12 @@ object JavaConversions {
       }
     }
 
-	@deprecated def elements = iterator
   }
 
   case class JSetWrapper[A](underlying : ju.Set[A]) extends mutable.Set[A] with generic.MutableSetTemplate[A, JSetWrapper[A]] {
     override def size = underlying.size
 
     def iterator = underlying.iterator
-    @deprecated def elements = iterator
 
     def contains(elem: A): Boolean = underlying.contains(elem)
 
@@ -455,8 +449,6 @@ object JavaConversions {
           }
         }
 
-	    @deprecated def elements = iterator
-
         def remove = prev match {
           case Some(k) => val v = self.remove(k.asInstanceOf[AnyRef]) ; prev = None ; v
           case _ => throw new IllegalStateException("next must be called at least once before remove")
diff --git a/src/library/scala/collection/generic/BitSetTemplate.scala b/src/library/scala/collection/generic/BitSetTemplate.scala
index e7fa26534c..66b279cf37 100644
--- a/src/library/scala/collection/generic/BitSetTemplate.scala
+++ b/src/library/scala/collection/generic/BitSetTemplate.scala
@@ -45,8 +45,6 @@ trait BitSetTemplate[+This <: BitSetTemplate[This] with Set[Int]] extends SetTem
       else Iterator.empty.next
   }
 
-  @deprecated def elements = iterator
-
   override def foreach[B](f: Int => B) {
     for (i <- 0 until nwords) {
       val w = word(i)
diff --git a/src/library/scala/collection/generic/IterableTemplate.scala b/src/library/scala/collection/generic/IterableTemplate.scala
index 7a0fb122f1..d5e6fb2523 100644
--- a/src/library/scala/collection/generic/IterableTemplate.scala
+++ b/src/library/scala/collection/generic/IterableTemplate.scala
@@ -39,6 +39,8 @@ trait IterableTemplate[+A, +This <: IterableTemplate[A, This] with Iterable[A]]
    */
   def iterator: Iterator[A]
 
+  @deprecated def elements = iterator
+
   /** Apply a function <code>f</code> to all elements of this
    *  traversable object.
    *
diff --git a/src/library/scala/collection/generic/LinearSequenceTemplate.scala b/src/library/scala/collection/generic/LinearSequenceTemplate.scala
index b87a417fd7..06dd14264f 100644
--- a/src/library/scala/collection/generic/LinearSequenceTemplate.scala
+++ b/src/library/scala/collection/generic/LinearSequenceTemplate.scala
@@ -70,8 +70,6 @@ trait LinearSequenceTemplate[+A, +This <: LinearSequenceTemplate[A, This] with L
     override def toList: List[A] = these.toList
   }
 
-  @deprecated def elements = iterator
-
   /** Apply the given function <code>f</code> to each element of this linear sequence
    *  (while respecting the order of the elements).
    *
diff --git a/src/library/scala/collection/generic/MapTemplate.scala b/src/library/scala/collection/generic/MapTemplate.scala
index ff67a1a379..74130cb487 100644
--- a/src/library/scala/collection/generic/MapTemplate.scala
+++ b/src/library/scala/collection/generic/MapTemplate.scala
@@ -52,8 +52,6 @@ self =>
   /** An iterator yielding all key/value mappings of this map. */
   def iterator: Iterator[(A, B)]
 
-  @deprecated def elements = iterator
-
   /** Add a key/value pair to this map, returning a new map.
    *  @param    kv the key/value pair
    *  @return   A new map with the new binding added to this map
@@ -120,7 +118,6 @@ self =>
   protected class DefaultKeySet extends Set[A] {
     def contains(key : A) = self.contains(key)
     def iterator = self.iterator.map(_._1)
-    @deprecated def elements = iterator
     def + (elem: A): Set[A] = (Set[A]() ++ this + elem).asInstanceOf[Set[A]] // !!! concrete overrides abstract problem
     def - (elem: A): Set[A] = (Set[A]() ++ this - elem).asInstanceOf[Set[A]] // !!! concrete overrides abstract problem
     override def size = self.size
diff --git a/src/library/scala/collection/immutable/ListSet.scala b/src/library/scala/collection/immutable/ListSet.scala
index 8dc961a308..2a7fa22661 100644
--- a/src/library/scala/collection/immutable/ListSet.scala
+++ b/src/library/scala/collection/immutable/ListSet.scala
@@ -70,8 +70,6 @@ class ListSet[A] extends Set[A]
       else { val res = that.elem; that = that.next; res }
   }
 
-  @deprecated def elements = iterator
-
   /**
    *  @throws Predef.NoSuchElementException
    */
diff --git a/src/library/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala
index 8acf786358..be7c67ec69 100644
--- a/src/library/scala/collection/immutable/Set.scala
+++ b/src/library/scala/collection/immutable/Set.scala
@@ -49,7 +49,6 @@ object Set extends SetFactory[Set] {
     def + (elem: A): Set[A] = new Set1(elem)
     def - (elem: A): Set[A] = this
     def iterator: Iterator[A] = Iterator.empty
-    @deprecated def elements = iterator
     override def foreach[U](f: A =>  U): Unit = {}
   }
 
@@ -67,7 +66,6 @@ object Set extends SetFactory[Set] {
       else this
     def iterator: Iterator[A] =
       Iterator(elem1)
-    @deprecated def elements = iterator
     override def foreach[U](f: A =>  U): Unit = {
       f(elem1)
     }
@@ -88,7 +86,6 @@ object Set extends SetFactory[Set] {
       else this
     def iterator: Iterator[A] =
       Iterator(elem1, elem2)
-    @deprecated def elements = iterator
     override def foreach[U](f: A =>  U): Unit = {
       f(elem1); f(elem2)
     }
@@ -110,7 +107,6 @@ object Set extends SetFactory[Set] {
       else this
     def iterator: Iterator[A] =
       Iterator(elem1, elem2, elem3)
-    @deprecated def elements = iterator
     override def foreach[U](f: A =>  U): Unit = {
       f(elem1); f(elem2); f(elem3)
     }
@@ -133,7 +129,6 @@ object Set extends SetFactory[Set] {
       else this
     def iterator: Iterator[A] =
       Iterator(elem1, elem2, elem3, elem4)
-    @deprecated def elements = iterator
     override def foreach[U](f: A =>  U): Unit = {
       f(elem1); f(elem2); f(elem3); f(elem4)
     }
diff --git a/src/library/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala
index 93faa59b45..151760b2c0 100644
--- a/src/library/scala/collection/immutable/TreeSet.scala
+++ b/src/library/scala/collection/immutable/TreeSet.scala
@@ -84,8 +84,6 @@ class TreeSet[A <% Ordered[A]](override val size: Int, t: RedBlack[A]#Tree[Unit]
    */
   def iterator: Iterator[A] = tree.toStream.iterator map (_._1)
 
-  @deprecated def elements = iterator
-
   override def toStream: Stream[A] = tree.toStream map (_._1)
 
   override def foreach[U](f: A =>  U) = tree foreach { (x, y) => f(x) }
diff --git a/src/library/scala/collection/mutable/ArrayStack.scala b/src/library/scala/collection/mutable/ArrayStack.scala
index cae18452f3..0c420300a4 100644
--- a/src/library/scala/collection/mutable/ArrayStack.scala
+++ b/src/library/scala/collection/mutable/ArrayStack.scala
@@ -162,8 +162,6 @@ class ArrayStack[T] private(private var table : Array[AnyRef],
     }
   }
 
-  @deprecated def elements = iterator
-
   override def foreach[U](f : T =>  U){
     var currentIndex = index;
     while(currentIndex > 0){
diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala
index de926e8108..7d360fd9bc 100644
--- a/src/library/scala/collection/mutable/FlatHashTable.scala
+++ b/src/library/scala/collection/mutable/FlatHashTable.scala
@@ -124,8 +124,6 @@ trait FlatHashTable[A] {
       else Iterator.empty.next
   }
 
-  @deprecated def elements = iterator
-
   private def growTable() {
     val oldtable = table
     table = new Array[AnyRef](table.length * 2)