Leveraged -Xmigration to burn off some warts wh...

Leveraged -Xmigration to burn off some warts which arose in the new
collections. Warnings put in place for behavioral changes, allowing the
following. 1) Buffers: create new collections on

++ and -- like all the other collections.  2) Maps: eliminated
never-shipped redundant method valuesIterable and supplied these
return types:

  def keys: Iterable[A]
  def keysIterator: Iterator[A]
  def values: Iterable[B]
  def valuesIterator: Iterator[B]
  def keySet: Set[A]

I concluded that keys should return Iterable because keySet also exists
on Map, and is not solely in the province of Maps even if we wanted to
change it: it's defined on Sorted and also appears in some Sets. So it
seems sensible to have keySet return a Set and keys return the more
general type.

Closes #3089, #3145.  Review by odersky.

1 files changed, 2 insertions, 15 deletions

diff --git a/src/compiler/scala/tools/nsc/PhaseAssembly.scala b/src/compiler/scala/tools/nsc/PhaseAssembly.scala
index 95ccee6b9d..dabf9547fe 100644
--- a/src/compiler/scala/tools/nsc/PhaseAssembly.scala
+++ b/src/compiler/scala/tools/nsc/PhaseAssembly.scala
@@ -96,21 +96,8 @@ trait PhaseAssembly { self: Global =>
     /* Given the entire graph, collect the phase objects at each level, where the phase
      * names are sorted alphabetical at each level, into the compiler phase list
      */
-    def compilerPhaseList(): List[SubComponent] = {
-      var chain: List[SubComponent] = Nil
-
-      var lvl = 1
-      var nds = nodes.valuesIterator.filter(_.level == lvl).toList
-      while(nds.size > 0) {
-        nds = nds sortBy (_.phasename)
-        for (n <- nds) {
-          chain = chain ::: n.phaseobj.get
-        }
-        lvl += 1
-        nds = nodes.valuesIterator.filter(_.level == lvl).toList
-      }
-      chain
-    }
+    def compilerPhaseList(): List[SubComponent] =
+      nodes.values.toList sortBy (x => (x.level, x.phasename)) flatMap (_.phaseobj) flatten
 
     /* Test if there are cycles in the graph, assign levels to the nodes
      * and collapse hard links into nodes