Remove uses of Collections from scala-reflect

Author: smarter

compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala

@@ -26,7 +26,6 @@ import dotty.tools.dotc.util.SourceFile
 import util.Positions._
 import annotation.switch
 import scala.collection.mutable.ListBuffer
-import scala.reflect.internal.util.Collections._
 
 object JavaParsers {
 
@@ -136,7 +135,7 @@ object JavaParsers {
       ValDef(name, tpt, EmptyTree).withMods(Modifiers(Flags.JavaDefined | Flags.ParamAccessor))
 
     def makeConstructor(formals: List[Tree], tparams: List[TypeDef], flags: FlagSet = Flags.JavaDefined) = {
-      val vparams = mapWithIndex(formals)((p, i) => makeSyntheticParam(i + 1, p))
+      val vparams = formals.zipWithIndex.map { case (p, i) => makeSyntheticParam(i + 1, p) }
       DefDef(nme.CONSTRUCTOR, tparams, List(vparams), TypeTree(), EmptyTree).withMods(Modifiers(flags))
     }
 

compiler/src/dotty/tools/dotc/transform/FullParameterization.scala

@@ -12,8 +12,6 @@ import NameOps._
 import ast._
 import ast.Trees._
 
-import scala.reflect.internal.util.Collections
-
 /** Provides methods to produce fully parameterized versions of instance methods,
  *  where the `this` of the enclosing class is abstracted out in an extra leading
  *  `$this` parameter and type parameters of the class become additional type
@@ -234,8 +232,8 @@ trait FullParameterization {
       fun.appliedToArgss(originalDef.vparamss.nestedMap(vparam => ref(vparam.symbol)))
     else {
       // this type could have changed on forwarding. Need to insert a cast.
-      val args = Collections.map2(originalDef.vparamss, fun.tpe.paramTypess)((vparams, paramTypes) =>
-        Collections.map2(vparams, paramTypes)((vparam, paramType) => {
+      val args = (originalDef.vparamss, fun.tpe.paramTypess).zipped.map((vparams, paramTypes) =>
+        (vparams, paramTypes).zipped.map((vparam, paramType) => {
           assert(vparam.tpe <:< paramType.widen) // type should still conform to widened type
           ref(vparam.symbol).ensureConforms(paramType)
         })

compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala

@@ -30,8 +30,6 @@ import dotty.tools.dotc.util.Positions.Position
 import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Flags
 
-import scala.reflect.internal.util.Collections
-
 /** This transform eliminates patterns. Right now it's a dummy.
  *  Awaiting the real pattern matcher.
  *  elimRepeated is required
@@ -166,7 +164,7 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {
     }
 
     def emitValDefs: List[ValDef] = {
-      Collections.map2(lhs, rhs)((symbol, tree) => ValDef(symbol.asTerm, tree.ensureConforms(symbol.info)))
+      (lhs, rhs).zipped.map((symbol, tree) => ValDef(symbol.asTerm, tree.ensureConforms(symbol.info)))
     }
   }
   object NoRebindings extends Rebindings(Nil, Nil)
@@ -609,7 +607,7 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {
             // only store binders actually used
             val (subPatBindersStored, subPatRefsStored) = stored.filter{case (b, _) => usedBinders(b)}.unzip
 
-            Block(Collections.map2(subPatBindersStored.toList, subPatRefsStored.toList)((bind, ref) => {
+            Block((subPatBindersStored.toList, subPatRefsStored.toList).zipped.map((bind, ref) => {
               // required in case original pattern had a more precise type
               // eg case s@"foo" =>  would be otherwise translated to s with type String instead of String("foo")
               def refTpeWiden = ref.tpe.widen