Make ImportInfo take an IFT argument

Author: odersky

compiler/src/dotty/tools/dotc/core/Contexts.scala

@@ -404,7 +404,7 @@ object Contexts {
         case _               => None
       }
       ctx.fresh.setImportInfo(
-        new ImportInfo(implicit ctx => sym, imp.selectors, impNameOpt, imp.importDelegate))
+        ImportInfo(sym, imp.selectors, impNameOpt, imp.importDelegate))
     }
 
     /** Does current phase use an erased types interpretation? */

compiler/src/dotty/tools/dotc/typer/ImportInfo.scala

@@ -19,7 +19,7 @@ object ImportInfo {
     val selectors = untpd.Ident(nme.WILDCARD) :: Nil
     def expr(implicit ctx: Context) = tpd.Ident(refFn())
     def imp(implicit ctx: Context) = tpd.Import(importDelegate = importDelegate, expr, selectors)
-    new ImportInfo(implicit ctx => imp.symbol, selectors, None, importDelegate = importDelegate, isRootImport = true)
+    new ImportInfo(imp.symbol, selectors, None, importDelegate = importDelegate, isRootImport = true)
   }
 }
 
@@ -32,7 +32,7 @@ object ImportInfo {
  *  @param   isRootImport  true if this is one of the implicit imports of scala, java.lang,
  *                         scala.Predef or dotty.DottyPredef in the start context, false otherwise.
  */
-class ImportInfo(symf: Context => Symbol, val selectors: List[untpd.Tree],
+class ImportInfo(symf: given Context => Symbol, val selectors: List[untpd.Tree],
                  symNameOpt: Option[TermName],
                  val importDelegate: Boolean,
                  val isRootImport: Boolean = false) extends Showable {
@@ -41,7 +41,7 @@ class ImportInfo(symf: Context => Symbol, val selectors: List[untpd.Tree],
   // that we cannot use one for `DottyPredefModuleRef`.
   def sym(implicit ctx: Context): Symbol = {
     if (mySym == null) {
-      mySym = symf(ctx)
+      mySym = symf given ctx
       assert(mySym != null)
     }
     mySym