reverted 'doArg' change made in r18738, removed...

reverted 'doArg' change made in r18738, removed a few warnings

1 files changed, 10 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
index 03526665dd..2ee768b592 100644
--- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
+++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -1,3 +1,9 @@
+/* NSC -- new Scala compiler
+ * Copyright 2005-2009 LAMP/EPFL
+ * @author Iulian Dragos
+ */
+// $Id$
+
 package scala.tools.nsc
 package transform
 
@@ -190,8 +196,8 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
     val tvars = if (sym.isClass) env.keySet
                 else specializedTypeVars(sym.info).intersect(env.keySet)
     val (methparams, others) = tvars.toList.partition(_.owner.isMethod)
-    val tvars1 = methparams.sort(_.name.toString < _.name.toString)
-    val tvars2 = others.sort(_.name.toString < _.name.toString)
+    val tvars1 = methparams.sortWith(_.name.toString < _.name.toString)
+    val tvars2 = others.sortWith(_.name.toString < _.name.toString)
     log("specName(" + sym + ") env " + env)
     specializedName(sym.name, tvars1 map env, tvars2 map env)
   }
@@ -1036,8 +1042,8 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
 
       // replace value and type paremeters of the old method with the new ones
       val symSubstituter = new ImplementationAdapter(
-        List.flatten(parameters(target))    ::: origtparams,
-        List.flatten(vparamss1).map(_.symbol) ::: newtparams)
+        parameters(target).flatten ::: origtparams,
+        vparamss1.flatten.map(_.symbol) ::: newtparams)
       val adapter = new AdaptSpecializedValues
       val tmp = symSubstituter(adapter(body(target).duplicate))
       tpt.tpe = tpt.tpe.substSym(oldtparams, newtparams)