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

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

4 files changed, 6 insertions, 6 deletions

diff --git a/test/disabled/jvm/serialization.scala b/test/disabled/jvm/serialization.scala
index 609210e64a..6caf8209ff 100755
--- a/test/disabled/jvm/serialization.scala
+++ b/test/disabled/jvm/serialization.scala
@@ -38,7 +38,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]): Boolean =
     (a1.length == a2.length) &&
@@ -282,7 +282,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/disabled/run/collection-stacks.scala b/test/disabled/run/collection-stacks.scala
index 665fb91e13..b159be07aa 100644
--- a/test/disabled/run/collection-stacks.scala
+++ b/test/disabled/run/collection-stacks.scala
@@ -16,8 +16,8 @@ object Test extends Application {
   }
 
   // check #957
-  check("1-2-3", immutableStack(1, 2, 3).elements.mkString("-"))
-  check("1-2-3", mutableStack(1, 2, 3).elements.mkString("-"))
+  check("1-2-3", immutableStack(1, 2, 3).iterator.mkString("-"))
+  check("1-2-3", mutableStack(1, 2, 3).iterator.mkString("-"))
 
   println("apply")
   check(1, immutableStack(1, 2, 3).apply(0))
diff --git a/test/disabled/run/forvaleq.scala b/test/disabled/run/forvaleq.scala
index 1e4fd33dbc..80d41acd85 100644
--- a/test/disabled/run/forvaleq.scala
+++ b/test/disabled/run/forvaleq.scala
@@ -49,7 +49,7 @@ object Test {
     // make sure it works on non-Ls
 
  //   val input: Queue = Queue.Empty[int].incl(L.range(0,20))
-    val input = L.range(0, 20).elements
+    val input = L.range(0, 20).iterator
     val oddFirstTimesTwo =
       for {x <- input
           xf = firstDigit(x)
diff --git a/test/disabled/run/iq.scala b/test/disabled/run/iq.scala
index 8ae3dbb080..b07da22fe6 100644
--- a/test/disabled/run/iq.scala
+++ b/test/disabled/run/iq.scala
@@ -73,7 +73,7 @@ object iq {
      *  Expected: Elements:  1  2  3  4  5  6  7  8  9
      */
     Console.print("Elements: ");
-    q6.elements.foreach(e => Console.print(" "+ e + " "))
+    q6.iterator.foreach(e => Console.print(" "+ e + " "))
     Console.println;
 
    /* Testing mkString