Skip to content

Commit 7279940

Browse files
som-snyttsom-snytt
committed
Rewrite imports
1 parent 0f9e502 commit 7279940

File tree

211 files changed

+139
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+139
-456
lines changed

‎compiler/src/dotty/tools/MainGenericCompiler.scala

-9
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,7 @@ import scala.annotation.tailrec
66
import scala.io.Source
77
import scala.util.Try
88
import java.io.File
9-
import java.lang.Thread
109
import scala.annotation.internal.sharable
11-
import dotty.tools.dotc.util.ClasspathFromClassloader
12-
import dotty.tools.runner.ObjectRunner
13-
import dotty.tools.dotc.config.Properties.envOrNone
14-
import dotty.tools.io.Jar
15-
import dotty.tools.runner.ScalaClassLoader
16-
import java.nio.file.Paths
17-
import dotty.tools.dotc.config.CommandLineParser
18-
import dotty.tools.scripting.StringDriver
1910

2011
enum CompileMode:
2112
case Guess

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import scala.annotation.{switch, tailrec}
88
import scala.collection.mutable.SortedMap
99

1010
import scala.tools.asm
11-
import scala.tools.asm.{Handle, Opcodes}
11+
import scala.tools.asm.Opcodes
1212
import BCodeHelpers.InvokeStyle
1313

1414
import dotty.tools.dotc.ast.tpd

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import dotty.tools.dotc.core.Types.*
3131
import dotty.tools.dotc.core.TypeErasure
3232
import dotty.tools.dotc.transform.GenericSignatures
3333
import dotty.tools.dotc.transform.ElimErasedValueType
34-
import dotty.tools.io.AbstractFile
3534
import dotty.tools.dotc.report
3635

3736
import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
@@ -49,7 +48,7 @@ trait BCodeHelpers extends BCodeIdiomatic {
4948
import bTypes.*
5049
import tpd.*
5150
import coreBTypes.*
52-
import int.{_, given}
51+
import int.given
5352
import DottyBackendInterface.*
5453

5554
// We need to access GenBCode phase to get access to post-processor components.
@@ -380,7 +379,6 @@ trait BCodeHelpers extends BCodeIdiomatic {
380379
} // end of trait BCAnnotGen
381380

382381
trait BCJGenSigGen {
383-
import int.given
384382

385383
def getCurrentCUnit(): CompilationUnit
386384

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ trait BCodeIdiomatic {
2121
val int: DottyBackendInterface
2222
val bTypes: BTypesFromSymbols[int.type]
2323

24-
import int.{_, given}
24+
import int.given
2525
import bTypes.*
2626
import coreBTypes.*
2727

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import dotty.tools.dotc.report
2929
*
3030
*/
3131
trait BCodeSkelBuilder extends BCodeHelpers {
32-
import int.{_, given}
32+
import int.given
3333
import DottyBackendInterface.{symExtensions, _}
3434
import tpd.*
3535
import bTypes.*

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

-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ package jvm
44

55
import scala.tools.asm
66
import scala.annotation.threadUnsafe
7-
import scala.collection.mutable
8-
import scala.collection.mutable.Clearable
97

108
import dotty.tools.dotc.core.Flags.*
119
import dotty.tools.dotc.core.Contexts.*
@@ -14,7 +12,6 @@ import dotty.tools.dotc.core.Symbols.*
1412
import dotty.tools.dotc.core.Phases.Phase
1513

1614
import dotty.tools.dotc.core.StdNames
17-
import dotty.tools.dotc.core.Phases
1815

1916
/**
2017
* This class mainly contains the method classBTypeFromSymbol, which extracts the necessary

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

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import scala.tools.asm.tree.InvokeDynamicInsnNode
66
import asm.tree.ClassNode
77
import scala.collection.mutable
88
import scala.jdk.CollectionConverters.*
9-
import dotty.tools.dotc.report
109

1110
import scala.language.unsafeNulls
1211

@@ -76,7 +75,6 @@ class BackendUtils(val postProcessor: PostProcessor) {
7675
*/
7776
def addLambdaDeserialize(classNode: ClassNode, implMethodsArray: Array[Handle]): Unit = {
7877
import asm.Opcodes.*
79-
import bTypes.*
8078
import coreBTypes.*
8179

8280
val cw = classNode

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ package dotty.tools.backend.jvm
33
import java.io.{DataOutputStream, File, IOException, BufferedOutputStream, FileOutputStream}
44
import java.nio.ByteBuffer
55
import java.nio.channels.{ClosedByInterruptException, FileChannel}
6-
import java.nio.charset.StandardCharsets.UTF_8
76
import java.nio.file.*
87
import java.nio.file.attribute.FileAttribute
98
import java.util
109
import java.util.concurrent.ConcurrentHashMap
1110
import java.util.zip.{CRC32, Deflater, ZipEntry, ZipOutputStream}
1211

13-
import dotty.tools.dotc.core.Contexts.*
1412
import dotty.tools.dotc.core.Decorators.em
15-
import dotty.tools.io.{AbstractFile, PlainFile, VirtualFile}
13+
import dotty.tools.io.{AbstractFile, PlainFile}
1614
import dotty.tools.io.PlainFile.toPlainFile
1715
import BTypes.InternalName
1816
import scala.util.chaining.*

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

-5
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ import scala.language.unsafeNulls
55
import dotty.tools.dotc.CompilationUnit
66
import dotty.tools.dotc.ast.Trees.{PackageDef, ValDef}
77
import dotty.tools.dotc.ast.tpd
8-
import dotty.tools.dotc.core.Phases.Phase
98

109
import scala.collection.mutable
11-
import scala.jdk.CollectionConverters.*
1210

1311
import dotty.tools.dotc.interfaces
1412
import dotty.tools.dotc.report
@@ -21,13 +19,10 @@ import Phases.*
2119
import Symbols.*
2220
import StdNames.nme
2321

24-
import java.io.DataOutputStream
25-
import java.nio.channels.ClosedByInterruptException
2622

2723
import dotty.tools.tasty.{ TastyBuffer, TastyHeaderUnpickler }
2824
import dotty.tools.dotc.core.tasty.TastyUnpickler
2925

30-
import scala.tools.asm
3126
import scala.tools.asm.tree.*
3227
import tpd.*
3328
import dotty.tools.io.AbstractFile

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

-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ package jvm
66
import dotty.tools.dotc.core.Symbols.*
77
import dotty.tools.dotc.transform.Erasure
88
import scala.tools.asm.{Handle, Opcodes}
9-
import dotty.tools.dotc.core.StdNames
10-
import BTypes.InternalName
119
import PostProcessorFrontendAccess.Lazy
1210

1311
abstract class CoreBTypes {
@@ -58,7 +56,6 @@ abstract class CoreBTypesFromSymbols[I <: DottyBackendInterface] extends CoreBTy
5856

5957
import bTypes.*
6058
import DottyBackendInterface.*
61-
import dotty.tools.dotc.core.Contexts.Context
6259
import frontendAccess.perRunLazy
6360
/**
6461
* Maps primitive types to their corresponding PrimitiveBType. The map is defined lexically above

‎compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import dotty.tools.dotc.core.Flags.*
88
import java.io.{File => _}
99

1010
import scala.reflect.ClassTag
11-
import dotty.tools.io.AbstractFile
1211
import dotty.tools.dotc.core.*
1312
import Contexts.*
1413
import Types.*

‎compiler/src/dotty/tools/backend/jvm/GenBCode.scala

-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import Symbols.*
1010
import dotty.tools.io.*
1111
import scala.collection.mutable
1212
import scala.compiletime.uninitialized
13-
import java.util.concurrent.TimeoutException
1413

15-
import scala.concurrent.duration.Duration
16-
import scala.concurrent.Await
1714

1815
class GenBCode extends Phase { self =>
1916

‎compiler/src/dotty/tools/backend/jvm/GenericSignatureVisitor.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.backend.jvm
22

33
import scala.language.unsafeNulls
44

5-
import scala.tools.asm.{ClassReader, Type, Handle }
5+
import scala.tools.asm.{Type, Handle }
66
import scala.tools.asm.tree.*
77

88
import scala.collection.mutable

‎compiler/src/dotty/tools/backend/jvm/PostProcessor.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package dotty.tools.backend.jvm
22

33
import java.util.concurrent.ConcurrentHashMap
44

5-
import scala.collection.mutable.ListBuffer
6-
import dotty.tools.dotc.util.{SourcePosition, NoSourcePosition}
5+
import dotty.tools.dotc.util.SourcePosition
76
import dotty.tools.io.AbstractFile
87
import dotty.tools.dotc.core.Contexts.*
98
import dotty.tools.dotc.core.Decorators.em

‎compiler/src/dotty/tools/backend/jvm/PostProcessorFrontendAccess.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package dotty.tools.backend.jvm
22

3-
import scala.collection.mutable.{Clearable, HashSet}
3+
import scala.collection.mutable.HashSet
44
import dotty.tools.dotc.util.*
55
import dotty.tools.dotc.reporting.Message
66
import dotty.tools.io.AbstractFile
7-
import java.util.{Collection => JCollection, Map => JMap}
87
import dotty.tools.dotc.core.Contexts.Context
98
import dotty.tools.dotc.report
10-
import dotty.tools.dotc.core.Phases
119
import scala.compiletime.uninitialized
1210

1311
/**

‎compiler/src/dotty/tools/backend/sjs/JSPositions.scala

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ class JSPositions()(using Context) {
6464
sourceAndSpan2irPos(sourcePos.source, sourcePos.span)
6565

6666
private object span2irPosCache {
67-
import dotty.tools.dotc.util.*
6867

6968
private var lastDotcSource: SourceFile = null
7069
private var lastIRSource: ir.Position.SourceFile = null

‎compiler/src/dotty/tools/dotc/CompilationUnit.scala

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import ast.Trees.{Import, Ident}
1414
import typer.Nullables
1515
import core.Decorators.*
1616
import config.{SourceVersion, Feature}
17-
import StdNames.nme
1817
import scala.annotation.internal.sharable
1918
import scala.util.control.NoStackTrace
2019
import transform.MacroAnnotations.isMacroAnnotation

‎compiler/src/dotty/tools/dotc/Driver.scala

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import dotty.tools.dotc.ast.Positioned
99
import dotty.tools.io.{AbstractFile, FileExtension}
1010
import reporting.*
1111
import core.Decorators.*
12-
import config.Feature
1312

1413
import scala.util.control.NonFatal
1514
import fromtasty.{TASTYCompiler, TastyFileUtil}

‎compiler/src/dotty/tools/dotc/Run.scala

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import typer.Typer
1212
import typer.ImportInfo.withRootImports
1313
import Decorators.*
1414
import io.AbstractFile
15-
import Phases.{unfusedPhases, Phase}
15+
import Phases.Phase
1616

1717
import sbt.interfaces.ProgressCallback
1818

@@ -22,17 +22,13 @@ import reporting.Diagnostic
2222
import reporting.Diagnostic.Warning
2323
import rewrites.Rewrites
2424
import profile.Profiler
25-
import printing.XprintMode
2625
import typer.ImplicitRunInfo
2726
import config.Feature
2827
import StdNames.nme
2928

30-
import java.io.{BufferedWriter, OutputStreamWriter}
31-
import java.nio.charset.StandardCharsets
3229

3330
import scala.collection.mutable
3431
import scala.util.control.NonFatal
35-
import scala.io.Codec
3632

3733
import Run.Progress
3834
import scala.compiletime.uninitialized

‎compiler/src/dotty/tools/dotc/ast/Desugar.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import core.*
66
import util.Spans.*, Types.*, Contexts.*, Constants.*, Names.*, NameOps.*, Flags.*
77
import Symbols.*, StdNames.*, Trees.*, ContextOps.*
88
import Decorators.*
9-
import Annotations.Annotation
109
import NameKinds.{UniqueName, ContextBoundParamName, ContextFunctionParamName, DefaultGetterName, WildcardParamName}
1110
import typer.{Namer, Checking}
1211
import util.{Property, SourceFile, SourcePosition, SrcPos, Chars}
1312
import config.{Feature, Config}
14-
import config.Feature.{sourceVersion, migrateTo3, enabled, betterForsEnabled}
13+
import config.Feature.betterForsEnabled
1514
import config.SourceVersion.*
1615
import collection.mutable
1716
import reporting.*
@@ -21,7 +20,6 @@ import config.Printers
2120
import parsing.Parsers
2221

2322
import scala.annotation.internal.sharable
24-
import scala.annotation.threadUnsafe
2523

2624
object desugar {
2725
import untpd.*

‎compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import util.{Property, SourceFile}
1010
import typer.ErrorReporting.*
1111
import transform.SyntheticMembers.ExtendsSingletonMirror
1212

13-
import scala.annotation.internal.sharable
1413

1514
/** Helper methods to desugar enums */
1615
object DesugarEnums {

‎compiler/src/dotty/tools/dotc/ast/MainProxies.scala

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ package dotty.tools.dotc
22
package ast
33

44
import core.*
5-
import Symbols.*, Types.*, Contexts.*, Decorators.*, util.Spans.*, Flags.*, Constants.*
6-
import StdNames.{nme, tpnme}
5+
import Symbols.*, Types.*, Contexts.*, Decorators.*, Flags.*, Constants.*
6+
import StdNames.nme
77
import ast.Trees.*
8-
import Names.Name
9-
import Comments.Comment
10-
import NameKinds.DefaultGetterName
11-
import Annotations.Annotation
128

139
object MainProxies {
1410

‎compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package ast
55
import core.*
66
import Flags.*, Trees.*, Types.*, Contexts.*
77
import Names.*, StdNames.*, NameOps.*, Symbols.*
8-
import Annotations.Annotation
98
import NameKinds.ContextBoundParamName
109
import typer.ConstFold
1110
import reporting.trace

‎compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package ast
44

55
import core.*
66
import Types.*, Contexts.*, Flags.*
7-
import Symbols.*, Annotations.*, Trees.*, Symbols.*, Constants.Constant
7+
import Annotations.*, Trees.*, Symbols.*, Constants.Constant
88
import Decorators.*
99

1010

‎compiler/src/dotty/tools/dotc/ast/tpd.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ package ast
55
import dotty.tools.dotc.transform.{ExplicitOuter, Erasure}
66
import typer.ProtoTypes
77
import core.*
8-
import Scopes.newScope
98
import util.Spans.*, Types.*, Contexts.*, Constants.*, Names.*, Flags.*, NameOps.*
10-
import Symbols.*, StdNames.*, Annotations.*, Trees.*, Symbols.*
9+
import StdNames.*, Annotations.*, Trees.*, Symbols.*
1110
import Decorators.*, DenotTransformers.*
1211
import collection.{immutable, mutable}
1312
import util.{Property, SourceFile}

‎compiler/src/dotty/tools/dotc/cc/CaptureAnnotation.scala

-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ package cc
44

55
import core.*
66
import Types.*, Symbols.*, Contexts.*, Annotations.*
7-
import ast.Trees.*
87
import ast.{tpd, untpd}
98
import Decorators.*
10-
import config.Printers.capt
119
import printing.Printer
1210
import printing.Texts.Text
1311

@@ -21,7 +19,6 @@ import printing.Texts.Text
2119
* @param cls the underlying class (either annotation.retains or annotation.retainsByName)
2220
*/
2321
case class CaptureAnnotation(refs: CaptureSet, boxed: Boolean)(cls: Symbol) extends Annotation:
24-
import CaptureAnnotation.*
2522
import tpd.*
2623

2724
/** A cache for the version of this annotation which differs in its boxed status. */

‎compiler/src/dotty/tools/dotc/cc/CaptureOps.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ package cc
55
import core.*
66
import Types.*, Symbols.*, Contexts.*, Annotations.*, Flags.*
77
import Names.TermName
8-
import ast.{tpd, untpd}
9-
import Decorators.*, NameOps.*
8+
import ast.tpd
9+
import Decorators.*
1010
import config.SourceVersion
1111
import config.Printers.capt
1212
import util.Property.Key
1313
import tpd.*
14-
import StdNames.nme
1514
import config.Feature
1615
import collection.mutable
1716
import CCState.*

‎compiler/src/dotty/tools/dotc/cc/CaptureRef.scala

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ package dotc
33
package cc
44

55
import core.*
6-
import Types.*, Symbols.*, Contexts.*, Decorators.*
7-
import util.{SimpleIdentitySet, Property}
8-
import typer.ErrorReporting.Addenda
6+
import Types.*, Symbols.*, Contexts.*
7+
import util.SimpleIdentitySet
98
import TypeComparer.subsumesExistentially
10-
import util.common.alwaysTrue
11-
import scala.collection.mutable
129
import CCState.*
1310
import Periods.NoRunId
1411
import compiletime.uninitialized

0 commit comments

Comments
 (0)