Reverting a couple replacements from that last ...

Reverting a couple replacements from that last patch which don't look so
safe on re-examination. No review.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
index dacc0cf506..1ad045d367 100644
--- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
+++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -278,7 +278,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
             tpes
           case _ =>
             log(sym + " specialized on everything")
-            primitiveTypes.values.toList
+            primitiveTypes.valuesIterator.toList
         }
       case _ =>
         Nil
@@ -581,8 +581,8 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
     if (sym.isMethod && !sym.info.typeParams.isEmpty) {
       val (stps, tps) = splitParams(sym.info.typeParams)
       val res = sym :: (for (env <- specializations(stps) if needsSpecialization(env, sym)) yield {
-        val keys = env.keys.toList;
-        val vals = env.values.toList
+        val keys = env.keysIterator.toList;
+        val vals = env.valuesIterator.toList
         val specMember =  sym.cloneSymbol(owner).setFlag(SPECIALIZED).resetFlag(DEFERRED)
         specMember.name = specializedName(sym, env)
 
@@ -778,8 +778,8 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
     }
     // disabled because of bugs in std. collections
     //val (keys, values) = env.iterator.toList.unzip
-    val keys = env.keys.toList
-    val values = env.values.toList
+    val keys = env.keysIterator.toList
+    val values = env.valuesIterator.toList
     (new FullTypeMap(keys, values))(tpe)
 //    tpe.subst(keys, values)
   }
diff --git a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
index 3ab0b9bb94..7ca2ff81bb 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
@@ -27,7 +27,7 @@ abstract class Duplicators extends Analyzer {
       newClassOwner = newThis
     } else resetClassOwners
 
-    envSubstitution = new SubstSkolemsTypeMap(env.keys.toList, env.values.toList)
+    envSubstitution = new SubstSkolemsTypeMap(env.keysIterator.toList, env.valuesIterator.toList)
     log("retyped with env: " + env)
     (new BodyDuplicator(context)).typed(tree)
   }