OrganizeImports.targetDialect = Scala3

bjaglin · Jan 22, 2024 · 5aa2327 · 5aa2327
1 parent 522efab
commit 5aa2327
Show file tree

Hide file tree

Showing 352 changed files with 2,092 additions and 2,092 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -1,3 +1,3 @@
 rules = [OrganizeImports]
 OrganizeImports.removeUnused = false
-OrganizeImports.targetDialect = Scala2
+OrganizeImports.targetDialect = Scala3
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala b/compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala
@@ -2,8 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
-import dotty.tools.dotc.core.Flags._
-import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Flags.*
+import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.report
 
 import scala.language.unsafeNulls

diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
@@ -4,18 +4,18 @@ package jvm
 
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Constants._
-import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Constants.*
+import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.em
-import dotty.tools.dotc.core.Flags.{Label => LabelFlag, _}
-import dotty.tools.dotc.core.Phases._
+import dotty.tools.dotc.core.Flags.{Label as LabelFlag, *}
+import dotty.tools.dotc.core.Phases.*
 import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.StdNames.str
-import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.core.Symbols.*
+import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.report
 import dotty.tools.dotc.transform.Erasure
-import dotty.tools.dotc.util.Spans._
+import dotty.tools.dotc.util.Spans.*
 
 import scala.annotation.switch
 import scala.annotation.tailrec

diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala b/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala
@@ -6,21 +6,21 @@ import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.Trees
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Annotations._
-import dotty.tools.dotc.core.Constants._
-import dotty.tools.dotc.core.Contexts._
-import dotty.tools.dotc.core.Decorators._
-import dotty.tools.dotc.core.Flags._
+import dotty.tools.dotc.core.Annotations.*
+import dotty.tools.dotc.core.Constants.*
+import dotty.tools.dotc.core.Contexts.*
+import dotty.tools.dotc.core.Decorators.*
+import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.NameKinds
 import dotty.tools.dotc.core.NameKinds.ExpandedName
 import dotty.tools.dotc.core.Names.Name
-import dotty.tools.dotc.core.Phases._
+import dotty.tools.dotc.core.Phases.*
 import dotty.tools.dotc.core.Signature
-import dotty.tools.dotc.core.StdNames._
-import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.StdNames.*
+import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.TypeErasure
 import dotty.tools.dotc.core.Types
-import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.report
 import dotty.tools.dotc.transform.ElimErasedValueType
 import dotty.tools.dotc.transform.GenericSignatures

diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
@@ -6,16 +6,16 @@ import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.TreeTypeMap
 import dotty.tools.dotc.ast.Trees.SyntheticUnit
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Contexts._
-import dotty.tools.dotc.core.Decorators._
-import dotty.tools.dotc.core.Flags._
-import dotty.tools.dotc.core.NameKinds._
+import dotty.tools.dotc.core.Contexts.*
+import dotty.tools.dotc.core.Decorators.*
+import dotty.tools.dotc.core.Flags.*
+import dotty.tools.dotc.core.NameKinds.*
 import dotty.tools.dotc.core.Names.TermName
-import dotty.tools.dotc.core.StdNames._
-import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.core.StdNames.*
+import dotty.tools.dotc.core.Symbols.*
+import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.report
-import dotty.tools.dotc.util.Spans._
+import dotty.tools.dotc.util.Spans.*
 
 import scala.annotation.tailrec
 import scala.collection.immutable

diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala
@@ -5,7 +5,7 @@ package jvm
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.StdNames.nme
-import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Symbols.*
 
 import scala.collection.immutable
 import scala.language.unsafeNulls

diff --git a/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala b/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala
@@ -2,13 +2,13 @@ package dotty.tools
 package backend
 package jvm
 
-import dotty.tools.dotc.core.Contexts._
-import dotty.tools.dotc.core.Flags._
+import dotty.tools.dotc.core.Contexts.*
+import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Phases
+import dotty.tools.dotc.core.Phases.*
 import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.dotc.core.Phases._
 import dotty.tools.dotc.core.StdNames
-import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Symbols.*
 
 import scala.annotation.threadUnsafe
 import scala.collection.mutable

diff --git a/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala b/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala
@@ -3,7 +3,7 @@ package dotty.tools.backend.jvm
 import dotty.tools.dotc.report
 
 import scala.collection.mutable
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 import scala.language.unsafeNulls
 import scala.tools.asm
 import scala.tools.asm.Handle

diff --git a/compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala b/compiler/src/dotty/tools/backend/jvm/ClassfileWriters.scala
@@ -1,6 +1,6 @@
 package dotty.tools.backend.jvm
 
-import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.em
 import dotty.tools.io.AbstractFile
 import dotty.tools.io.JarArchive
@@ -15,7 +15,7 @@ import java.nio.ByteBuffer
 import java.nio.channels.ClosedByInterruptException
 import java.nio.channels.FileChannel
 import java.nio.charset.StandardCharsets.UTF_8
-import java.nio.file._
+import java.nio.file.*
 import java.nio.file.attribute.FileAttribute
 import java.util
 import java.util.concurrent.ConcurrentHashMap
@@ -24,7 +24,7 @@ import java.util.zip.Deflater
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 import scala.language.unsafeNulls
-import scala.util.chaining._
+import scala.util.chaining.*
 
 import BTypes.InternalName
 

diff --git a/compiler/src/dotty/tools/backend/jvm/CodeGen.scala b/compiler/src/dotty/tools/backend/jvm/CodeGen.scala
@@ -4,8 +4,8 @@ import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.Trees.PackageDef
 import dotty.tools.dotc.ast.Trees.ValDef
 import dotty.tools.dotc.ast.tpd
+import dotty.tools.dotc.core.*
 import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.dotc.core._
 import dotty.tools.dotc.core.tasty.TastyUnpickler
 import dotty.tools.dotc.interfaces
 import dotty.tools.dotc.report
@@ -20,16 +20,16 @@ import java.io.DataOutputStream
 import java.nio.channels.ClosedByInterruptException
 import java.util.Optional
 import scala.collection.mutable
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 import scala.language.unsafeNulls
 import scala.tools.asm
-import scala.tools.asm.tree._
+import scala.tools.asm.tree.*
 
-import Contexts._
-import Phases._
-import Symbols._
+import Contexts.*
+import Phases.*
+import Symbols.*
 import StdNames.nme
-import tpd._
+import tpd.*
 
 
 class CodeGen(val int: DottyBackendInterface, val primitives: DottyPrimitives)( val bTypes: BTypesFromSymbols[int.type]) { self =>

diff --git a/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala b/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala
@@ -1,10 +1,10 @@
 package dotty.tools.backend.jvm
 
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.Trait
-import dotty.tools.dotc.core.Phases._
-import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Phases.*
+import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.transform.MegaPhase.MiniPhase
 
 /** Collect all super calls to trait members.

diff --git a/compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala b/compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala
@@ -4,7 +4,7 @@ package jvm
 
 
 import dotty.tools.dotc.core.StdNames
-import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.transform.Erasure
 
 import scala.tools.asm.Handle

diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -1,22 +1,22 @@
 package dotty.tools.backend.jvm
 
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Flags._
-import dotty.tools.dotc.core._
+import dotty.tools.dotc.core.*
+import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.report
 import dotty.tools.dotc.util.ReadOnlyMap
 import dotty.tools.io.AbstractFile
 
-import java.io.{File => _}
+import java.io.File as _
 import scala.language.unsafeNulls
 import scala.reflect.ClassTag
 
-import Contexts._
-import Types._
-import Symbols._
-import Phases._
+import Contexts.*
+import Types.*
+import Symbols.*
+import Phases.*
 import Decorators.em
-import tpd._
+import tpd.*
 import StdNames.nme
 import NameKinds.{LazyBitMapName, LazyLocalName}
 import Names.Name

diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala
@@ -1,17 +1,17 @@
 package dotty.tools.backend.jvm
 
 import dotty.tools.dotc.CompilationUnit
+import dotty.tools.dotc.core.*
 import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.dotc.core._
 import dotty.tools.dotc.interfaces.CompilerCallback
 import dotty.tools.dotc.report
-import dotty.tools.io._
+import dotty.tools.io.*
 
 import scala.collection.mutable
 import scala.compiletime.uninitialized
 
-import Contexts._
-import Symbols._
+import Contexts.*
+import Symbols.*
 
 class GenBCode extends Phase { self =>
 

diff --git a/compiler/src/dotty/tools/backend/jvm/GeneratedClassHandler.scala b/compiler/src/dotty/tools/backend/jvm/GeneratedClassHandler.scala
@@ -1,14 +1,14 @@
 package dotty.tools.backend.jvm
 
-import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.em
 import dotty.tools.dotc.core.Phases
 import dotty.tools.dotc.profile.ThreadPoolFactory
 import dotty.tools.io.AbstractFile
 
 import java.nio.channels.ClosedByInterruptException
+import java.util.concurrent.*
 import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy
-import java.util.concurrent._
 import scala.collection.mutable.ListBuffer
 import scala.compiletime.uninitialized
 import scala.concurrent.Await

diff --git a/compiler/src/dotty/tools/backend/jvm/GenericSignatureVisitor.scala b/compiler/src/dotty/tools/backend/jvm/GenericSignatureVisitor.scala
@@ -1,13 +1,13 @@
 package dotty.tools.backend.jvm
 
-import scala.annotation._
+import scala.annotation.*
 import scala.collection.mutable
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 import scala.language.unsafeNulls
 import scala.tools.asm.ClassReader
 import scala.tools.asm.Handle
 import scala.tools.asm.Type
-import scala.tools.asm.tree._
+import scala.tools.asm.tree.*
 import scala.util.control.NoStackTrace
 import scala.util.control.NonFatal
 

diff --git a/compiler/src/dotty/tools/backend/jvm/PostProcessor.scala b/compiler/src/dotty/tools/backend/jvm/PostProcessor.scala
@@ -1,6 +1,6 @@
 package dotty.tools.backend.jvm
 
-import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.em
 import dotty.tools.dotc.util.NoSourcePosition
 import dotty.tools.dotc.util.SourcePosition

diff --git a/compiler/src/dotty/tools/backend/jvm/PostProcessorFrontendAccess.scala b/compiler/src/dotty/tools/backend/jvm/PostProcessorFrontendAccess.scala
@@ -4,11 +4,11 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Phases
 import dotty.tools.dotc.report
 import dotty.tools.dotc.reporting.Message
-import dotty.tools.dotc.util._
+import dotty.tools.dotc.util.*
 import dotty.tools.io.AbstractFile
 
-import java.util.{Collection => JCollection}
-import java.util.{Map => JMap}
+import java.util.Collection as JCollection
+import java.util.Map as JMap
 import scala.collection.mutable.Clearable
 import scala.collection.mutable.HashSet
 import scala.compiletime.uninitialized

diff --git a/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala
@@ -4,11 +4,11 @@ package backend.jvm
 import scala.annotation.threadUnsafe
 
 import dotc.ast.Trees.Select
-import dotc.ast.tpd._
-import dotc.core._
-import Contexts._
+import dotc.ast.tpd.*
+import dotc.core.*
+import Contexts.*
 import Names.TermName
-import StdNames._
+import StdNames.*
 import Types.{JavaArrayType, UnspecifiedErrorType, Type}
 import Symbols.{Symbol, NoSymbol}
 import Decorators.em

diff --git a/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala b/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala
@@ -1,9 +1,9 @@
 package dotty.tools.backend.sjs
 
-import dotty.tools.dotc.core._
+import dotty.tools.dotc.core.*
 
-import Contexts._
-import Phases._
+import Contexts.*
+import Phases.*
 
 /** Generates Scala.js IR files for the compilation unit. */
 class GenSJSIR extends Phase {