In "Iterable" and in all its subclasses, "itera...

In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).

3 files changed, 4 insertions, 4 deletions

diff --git a/test/pending/jvm/serialization.scala b/test/pending/jvm/serialization.scala
index 589e82c4c1..2c46ee0b7b 100644
--- a/test/pending/jvm/serialization.scala
+++ b/test/pending/jvm/serialization.scala
@@ -39,7 +39,7 @@ object Serialize {
 object Test1_scala {
 
   private def arrayToString[A](arr: Array[A]): String =
-    List.fromArray(arr).mkString("Array[",",","]")
+    arr.mkString("Array[",",","]")
 
   private def arrayEquals[A, B](a1: Array[A], a2: Array[B]) =
      (a1.length == a2.length) &&
@@ -225,7 +225,7 @@ object Test4_xml {
           <th>Last Name</th>
           <th>First Name</th>
         </tr>
-        { for (val p <- people) yield
+        { for (p <- people) yield
         <tr>
           <td> { p.name } </td>
           <td> { p.age.toString() } </td>
diff --git a/test/pending/pos/bug586.scala b/test/pending/pos/bug586.scala
index ca0a508baa..b736e6ab43 100644
--- a/test/pending/pos/bug586.scala
+++ b/test/pending/pos/bug586.scala
@@ -11,7 +11,7 @@ with imm.Set[A]
   def +(elem: A) = new HashTreeSet(map + elem -> ())
   def -(elem: A) = new HashTreeSet(map - elem)
   def contains(elem: A) = map.isDefinedAt(elem)
-  def elements = map.elements.map(._1)
+  def iterator = map.iterator.map(._1)
   def empty:imm.Set[A] = new HashTreeSet[A]()
 }
 
diff --git a/test/pending/run/t1044.scala b/test/pending/run/t1044.scala
index 136cc51af2..e10002e601 100644
--- a/test/pending/run/t1044.scala
+++ b/test/pending/run/t1044.scala
@@ -1,4 +1,4 @@
 object Main extends Application{
  val ducks = Array[AnyRef]("Huey", "Dewey", "Louie")
- ducks.elements/*.asInstanceOf[Iterator[String]]*/
+ ducks.iterator/*.asInstanceOf[Iterator[String]]*/
 }