Rewrite imports

Author: som-snytt

compiler/src/dotty/tools/MainGenericCompiler.scala

@@ -6,16 +6,7 @@ import scala.annotation.tailrec
 import scala.io.Source
 import scala.util.Try
 import java.io.File
-import java.lang.Thread
 import scala.annotation.internal.sharable
-import dotty.tools.dotc.util.ClasspathFromClassloader
-import dotty.tools.runner.ObjectRunner
-import dotty.tools.dotc.config.Properties.envOrNone
-import dotty.tools.io.Jar
-import dotty.tools.runner.ScalaClassLoader
-import java.nio.file.Paths
-import dotty.tools.dotc.config.CommandLineParser
-import dotty.tools.scripting.StringDriver
 
 enum CompileMode:
   case Guess

compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

@@ -8,7 +8,7 @@ import scala.annotation.{switch, tailrec}
 import scala.collection.mutable.SortedMap
 
 import scala.tools.asm
-import scala.tools.asm.{Handle, Opcodes}
+import scala.tools.asm.Opcodes
 import BCodeHelpers.InvokeStyle
 
 import dotty.tools.dotc.ast.tpd

compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

@@ -31,7 +31,6 @@ import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.core.TypeErasure
 import dotty.tools.dotc.transform.GenericSignatures
 import dotty.tools.dotc.transform.ElimErasedValueType
-import dotty.tools.io.AbstractFile
 import dotty.tools.dotc.report
 
 import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
@@ -49,7 +48,7 @@ trait BCodeHelpers extends BCodeIdiomatic {
   import bTypes.*
   import tpd.*
   import coreBTypes.*
-  import int.{_, given}
+  import int.given
   import DottyBackendInterface.*
 
   // We need to access GenBCode phase to get access to post-processor components.
@@ -380,7 +379,6 @@ trait BCodeHelpers extends BCodeIdiomatic {
   } // end of trait BCAnnotGen
 
   trait BCJGenSigGen {
-    import int.given
 
     def getCurrentCUnit(): CompilationUnit
 

compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala

@@ -21,7 +21,7 @@ trait BCodeIdiomatic {
   val int: DottyBackendInterface
   val bTypes: BTypesFromSymbols[int.type]
 
-  import int.{_, given}
+  import int.given
   import bTypes.*
   import coreBTypes.*
 

compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala

@@ -29,7 +29,7 @@ import dotty.tools.dotc.report
  *
  */
 trait BCodeSkelBuilder extends BCodeHelpers {
-  import int.{_, given}
+  import int.given
   import DottyBackendInterface.{symExtensions, _}
   import tpd.*
   import bTypes.*

compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala

@@ -4,8 +4,6 @@ package jvm
 
 import scala.tools.asm
 import scala.annotation.threadUnsafe
-import scala.collection.mutable
-import scala.collection.mutable.Clearable
 
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Contexts.*
@@ -14,7 +12,6 @@ import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Phases.Phase
 
 import dotty.tools.dotc.core.StdNames
-import dotty.tools.dotc.core.Phases
 
 /**
  * This class mainly contains the method classBTypeFromSymbol, which extracts the necessary

compiler/src/dotty/tools/backend/jvm/BackendUtils.scala

@@ -6,7 +6,6 @@ import scala.tools.asm.tree.InvokeDynamicInsnNode
 import asm.tree.ClassNode
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.*
-import dotty.tools.dotc.report
 
 import scala.language.unsafeNulls
 
@@ -76,7 +75,6 @@ class BackendUtils(val postProcessor: PostProcessor) {
   */
   def addLambdaDeserialize(classNode: ClassNode, implMethodsArray: Array[Handle]): Unit = {
     import asm.Opcodes.*
-    import bTypes.*
     import coreBTypes.*
 
     val cw = classNode

compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala

@@ -3,16 +3,14 @@ package dotty.tools.backend.jvm
 import java.io.{DataOutputStream, File, IOException, BufferedOutputStream, FileOutputStream}
 import java.nio.ByteBuffer
 import java.nio.channels.{ClosedByInterruptException, FileChannel}
-import java.nio.charset.StandardCharsets.UTF_8
 import java.nio.file.*
 import java.nio.file.attribute.FileAttribute
 import java.util
 import java.util.concurrent.ConcurrentHashMap
 import java.util.zip.{CRC32, Deflater, ZipEntry, ZipOutputStream}
 
-import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.em
-import dotty.tools.io.{AbstractFile, PlainFile, VirtualFile}
+import dotty.tools.io.{AbstractFile, PlainFile}
 import dotty.tools.io.PlainFile.toPlainFile
 import BTypes.InternalName
 import scala.util.chaining.*

compiler/src/dotty/tools/backend/jvm/CodeGen.scala

@@ -5,10 +5,8 @@ import scala.language.unsafeNulls
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.Trees.{PackageDef, ValDef}
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Phases.Phase
 
 import scala.collection.mutable
-import scala.jdk.CollectionConverters.*
 
 import dotty.tools.dotc.interfaces
 import dotty.tools.dotc.report
@@ -21,13 +19,10 @@ import Phases.*
 import Symbols.*
 import StdNames.nme
 
-import java.io.DataOutputStream
-import java.nio.channels.ClosedByInterruptException
 
 import dotty.tools.tasty.{ TastyBuffer, TastyHeaderUnpickler }
 import dotty.tools.dotc.core.tasty.TastyUnpickler
 
-import scala.tools.asm
 import scala.tools.asm.tree.*
 import tpd.*
 import dotty.tools.io.AbstractFile

compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala

@@ -6,8 +6,6 @@ package jvm
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.transform.Erasure
 import scala.tools.asm.{Handle, Opcodes}
-import dotty.tools.dotc.core.StdNames
-import BTypes.InternalName
 import PostProcessorFrontendAccess.Lazy
 
 abstract class CoreBTypes {
@@ -58,7 +56,6 @@ abstract class CoreBTypesFromSymbols[I <: DottyBackendInterface] extends CoreBTy
 
   import bTypes.*
   import DottyBackendInterface.*
-  import dotty.tools.dotc.core.Contexts.Context
   import frontendAccess.perRunLazy
   /**
    * Maps primitive types to their corresponding PrimitiveBType. The map is defined lexically above