Skip to content

Commit 6f09911

Browse files
som-snyttsom-snytt
committed
Fixups
1 parent 0babef5 commit 6f09911

File tree

214 files changed

+88
-599
lines changed

Some content is hidden

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

214 files changed

+88
-599
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import dotty.tools.dotc.report
1111
* the compiler cake (Global).
1212
*/
1313
final class BCodeAsmCommon[I <: DottyBackendInterface](val interface: I) {
14-
import interface.{*, given}
14+
import interface.given
1515
import DottyBackendInterface.symExtensions
1616

1717
/**

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ import scala.annotation.switch
66
import scala.collection.mutable.SortedMap
77

88
import scala.tools.asm
9-
import scala.tools.asm.{Handle, Label, Opcodes}
9+
import scala.tools.asm.{Handle, Opcodes}
1010
import BCodeHelpers.InvokeStyle
1111

1212
import dotty.tools.dotc.ast.tpd
1313
import dotty.tools.dotc.CompilationUnit
1414
import dotty.tools.dotc.core.Constants._
15-
import dotty.tools.dotc.core.Decorators._
1615
import dotty.tools.dotc.core.Flags.{Label => LabelFlag, _}
1716
import dotty.tools.dotc.core.Types._
1817
import dotty.tools.dotc.core.StdNames.{nme, str}
@@ -915,7 +914,6 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
915914
var default: asm.Label = null
916915
var indirectBlocks: List[(asm.Label, Tree)] = Nil
917916

918-
import scala.collection.mutable
919917

920918
// Cases grouped by their hashCode
921919
val casesByHash = SortedMap.empty[Int, List[(String, Either[asm.Label, Tree])]]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
6262
@threadUnsafe lazy val JavaAnnotationClass: ClassSymbol = requiredClass("java.lang.annotation.Annotation")
6363

6464
val bCodeAsmCommon: BCodeAsmCommon[int.type] = new BCodeAsmCommon(int)
65-
import bCodeAsmCommon._
6665

6766
/*
6867
* must-single-thread
@@ -479,7 +478,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
479478
} // end of trait BCAnnotGen
480479

481480
trait BCJGenSigGen {
482-
import int.{_, given}
481+
import int.given
483482

484483
def getCurrentCUnit(): CompilationUnit
485484

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ package jvm
44

55
import scala.tools.asm
66
import scala.annotation.switch
7-
import scala.collection.mutable
87
import Primitives.{NE, EQ, TestOp, ArithmeticOp}
98
import scala.tools.asm.tree.MethodInsnNode
109
import dotty.tools.dotc.report

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@ package backend
33
package jvm
44

55
import scala.collection.{ mutable, immutable }
6-
import scala.annotation.switch
76

87
import scala.tools.asm
9-
import scala.tools.asm.util.{TraceMethodVisitor, ASMifier}
10-
import java.io.PrintWriter
118

129
import dotty.tools.dotc.ast.tpd
1310
import dotty.tools.dotc.ast.TreeTypeMap
1411
import dotty.tools.dotc.CompilationUnit
15-
import dotty.tools.dotc.core.Annotations.Annotation
1612
import dotty.tools.dotc.core.Decorators._
1713
import dotty.tools.dotc.core.Flags._
1814
import dotty.tools.dotc.core.StdNames._

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import dotty.tools.dotc.CompilationUnit
99
import dotty.tools.dotc.core.StdNames.nme
1010
import dotty.tools.dotc.core.Symbols._
1111
import dotty.tools.dotc.ast.tpd
12-
import dotty.tools.dotc.ast.tpd.TreeOps
1312

1413
/*
1514
*
@@ -18,7 +17,7 @@ import dotty.tools.dotc.ast.tpd.TreeOps
1817
*
1918
*/
2019
trait BCodeSyncAndTry extends BCodeBodyBuilder {
21-
import int.{_, given}
20+
import int.given
2221
import tpd._
2322
import bTypes._
2423
import coreBTypes._

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import scala.tools.asm
1515
abstract class BTypes {
1616

1717
val int: DottyBackendInterface
18-
import int.{_, given}
18+
import int.given
1919
/**
2020
* A map from internal names to ClassBTypes. Every ClassBType is added to this map on its
2121
* construction.

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ package dotty.tools
22
package backend
33
package jvm
44

5-
import java.io.{ DataOutputStream, FileOutputStream, IOException, OutputStream, File => JFile }
5+
import java.io.{ DataOutputStream, FileOutputStream, IOException, File as JFile }
66
import java.nio.channels.ClosedByInterruptException
7-
import java.nio.file.Files
87
import dotty.tools.io._
98
import dotty.tools.dotc.report
109

11-
import java.util.jar.Attributes.Name
12-
import scala.language.postfixOps
1310

1411
/** Can't output a file due to the state of the file system. */
1512
class FileConflictException(msg: String, val file: AbstractFile) extends IOException(msg)

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ package dotty.tools
22
package backend
33
package jvm
44

5-
import scala.annotation.switch
65

7-
import dotty.tools.dotc.core.Decorators._
86
import dotty.tools.dotc.core.Symbols._
97
import dotty.tools.dotc.transform.Erasure
108

@@ -33,7 +31,7 @@ import dotty.tools.dotc.transform.Erasure
3331
*/
3432
class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTypes: BTFS) {
3533
import bTypes._
36-
import int.{_, given}
34+
import int.given
3735
import DottyBackendInterface._
3836

3937
//import global._
@@ -212,7 +210,6 @@ trait CoreBTypesProxyGlobalIndependent[BTS <: BTypes] {
212210
*/
213211
final class CoreBTypesProxy[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTypes: BTFS) extends CoreBTypesProxyGlobalIndependent[BTFS] {
214212
import bTypes._
215-
import bTypes.int._
216213

217214
private var _coreBTypes: CoreBTypes[bTypes.type] = _
218215
def setBTypes(coreBTypes: CoreBTypes[BTFS]): Unit = {

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,25 @@
11
package dotty.tools.backend.jvm
22

33
import dotty.tools.dotc.ast.tpd
4-
import dotty.tools.dotc.ast.Trees
5-
import dotty.tools.dotc
64
import dotty.tools.dotc.core.Flags._
7-
import dotty.tools.dotc.transform.{Erasure, GenericSignatures}
85
import dotty.tools.dotc.transform.SymUtils._
96
import java.io.{File => _}
107

11-
import scala.annotation.threadUnsafe
12-
import scala.collection.generic.Clearable
13-
import scala.collection.mutable
148
import scala.reflect.ClassTag
159
import dotty.tools.io.AbstractFile
16-
import scala.tools.asm.AnnotationVisitor
1710
import dotty.tools.dotc.core._
1811
import Contexts._
1912
import Types._
2013
import Symbols._
2114
import Phases._
2215

23-
import dotty.tools.dotc.util
24-
import dotty.tools.dotc.util.{Spans, ReadOnlyMap}
16+
import dotty.tools.dotc.util.ReadOnlyMap
2517
import dotty.tools.dotc.report
2618

27-
import Decorators._
28-
import Constants._
2919
import tpd._
3020

31-
import scala.tools.asm
32-
import StdNames.{nme, str}
33-
import NameKinds.{DefaultGetterName, ExpandedName, LazyBitMapName}
34-
import Names.TermName
35-
import Annotations.Annotation
21+
import StdNames.nme
22+
import NameKinds.LazyBitMapName
3623
import Names.Name
3724

3825
class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap: ReadOnlyMap[Symbol, Set[ClassSymbol]])(using val ctx: Context) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import dotty.tools.dotc.sbt.ExtractDependencies
1919
import Contexts._
2020
import Phases._
2121
import Symbols._
22-
import Decorators._
2322

2423
import java.io.DataOutputStream
2524
import java.nio.channels.ClosedByInterruptException

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,22 @@ import dotty.tools.FatalError
88

99
import dotty.tools.dotc.CompilationUnit
1010
import dotty.tools.dotc.ast.tpd
11-
import dotty.tools.dotc.core.Phases.Phase
1211

1312
import dotty.tools.dotc.core._
14-
import Periods._
15-
import SymDenotations._
1613
import Contexts._
1714
import Decorators._
1815
import Flags._
19-
import dotty.tools.dotc.ast.Trees._
2016
import Names._
2117
import NameKinds.DefaultGetterName
2218
import Types._
2319
import Symbols._
24-
import Denotations._
2520
import Phases._
2621
import StdNames._
2722
import TypeErasure.ErasedValueType
2823

2924
import dotty.tools.dotc.transform.{Erasure, ValueClasses}
3025
import dotty.tools.dotc.transform.SymUtils._
3126
import dotty.tools.dotc.util.SourcePosition
32-
import dotty.tools.dotc.util.Spans.Span
3327
import dotty.tools.dotc.report
3428

3529
import org.scalajs.ir
@@ -2580,7 +2574,6 @@ class JSCodeGen()(using genCtx: Context) {
25802574
/** Gen JS code for a simple binary operation. */
25812575
private def genSimpleBinaryOp(tree: Apply, lhs: Tree, rhs: Tree, code: Int): js.Tree = {
25822576
import dotty.tools.backend.ScalaPrimitivesOps._
2583-
import js.UnaryOp._
25842577

25852578
implicit val pos: SourcePosition = tree.sourcePos
25862579

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import scala.annotation.threadUnsafe
66
import Types._
77
import Contexts._
88
import Symbols._
9-
import Names._
109
import StdNames._
11-
import Decorators._
1210

1311
import dotty.tools.dotc.config.SJSPlatform
1412

‎compiler/src/dotty/tools/dotc/core/Scopes.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import Phases._
1616
import Denotations._
1717
import printing.Texts._
1818
import printing.Printer
19-
import util.common._
2019
import SymDenotations.NoDenotation
2120

2221
import collection.mutable

‎compiler/src/dotty/tools/dotc/core/SymDenotations.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Scopes.Scope
1212
import dotty.tools.io.AbstractFile
1313
import Decorators._
1414
import ast._
15-
import ast.Trees.{LambdaTypeTree, TypeBoundsTree, TypeDef}
15+
import ast.Trees.{LambdaTypeTree, TypeBoundsTree}
1616
import Trees.Literal
1717
import Variances.Variance
1818
import annotation.tailrec
@@ -23,7 +23,6 @@ import scala.util.control.NonFatal
2323
import config.Config
2424
import reporting._
2525
import collection.mutable
26-
import transform.TypeUtils._
2726

2827
import scala.annotation.internal.sharable
2928

‎compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package core
55
import java.io.{IOException, File}
66
import java.nio.channels.ClosedByInterruptException
77

8-
import scala.compat.Platform.currentTime
98
import scala.util.control.NonFatal
109

1110
import dotty.tools.io.{ ClassPath, ClassRepresentation, AbstractFile }
@@ -19,9 +18,7 @@ import Decorators._
1918

2019
import util.Stats
2120
import reporting.trace
22-
import config.Config
2321

24-
import ast.Trees._
2522
import ast.desugar
2623

2724
import parsing.JavaParsers.OutlineJavaParser

‎compiler/src/dotty/tools/dotc/core/Symbols.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import Names._
77
import Scopes._
88
import Flags._
99
import Decorators._
10-
import Symbols._
1110
import Contexts._
1211
import Phases._
1312
import SymDenotations._
@@ -25,13 +24,11 @@ import ast.tpd
2524
import tpd.{Tree, TreeProvider, TreeOps}
2625
import ast.TreeTypeMap
2726
import Constants.Constant
28-
import Variances.{Variance, varianceFromInt}
27+
import Variances.Variance
2928
import reporting.Message
3029
import collection.mutable
3130
import io.AbstractFile
32-
import language.implicitConversions
3331
import util.{SourceFile, NoSource, Property, SourcePosition, SrcPos, EqHashMap}
34-
import scala.collection.JavaConverters._
3532
import scala.annotation.internal.sharable
3633
import config.Printers.typr
3734

‎compiler/src/dotty/tools/dotc/core/TypeApplications.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import SymDenotations.LazyType
99
import Decorators._
1010
import util.Stats._
1111
import Names._
12-
import NameOps._
1312
import Flags.Module
14-
import Variances.variancesConform
1513
import dotty.tools.dotc.config.Config
1614

1715
object TypeApplications {

‎compiler/src/dotty/tools/dotc/core/TypeComparer.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import collection.mutable
1111
import util.Stats
1212
import config.Config
1313
import config.Feature.migrateTo3
14-
import config.Printers.{constr, subtyping, gadts, matchTypes, noPrinter}
14+
import config.Printers.{subtyping, gadts, matchTypes, noPrinter}
1515
import TypeErasure.{erasedLub, erasedGlb}
1616
import TypeApplications._
1717
import Variances.{Variance, variancesConform}
@@ -22,7 +22,6 @@ import scala.util.control.NonFatal
2222
import typer.ProtoTypes.constrained
2323
import typer.Applications.productSelectorTypes
2424
import reporting.trace
25-
import NullOpsDecorator._
2625
import annotation.constructorOnly
2726

2827
/** Provides methods to compare types.

‎compiler/src/dotty/tools/dotc/core/TypeOps.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@ import Decorators._
1010
import StdNames._
1111
import collection.mutable
1212
import ast.tpd._
13-
import reporting.{trace, Message}
14-
import config.Printers.{gadts, typr}
13+
import reporting.trace
14+
import config.Printers.typr
1515
import config.Feature
16-
import typer.Applications._
1716
import typer.ProtoTypes._
1817
import typer.ForceDegree
1918
import typer.Inferencing._
20-
import typer.IfBottom
21-
import reporting.TestingReporter
2219

2320
import scala.annotation.internal.sharable
2421
import scala.annotation.threadUnsafe

‎compiler/src/dotty/tools/dotc/core/TyperState.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package core
44

55
import Types._
66
import Contexts._
7-
import util.{SimpleIdentityMap, SimpleIdentitySet}
7+
import util.SimpleIdentitySet
88
import reporting._
99
import config.Config
1010
import config.Printers.constr

‎compiler/src/dotty/tools/dotc/core/Types.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package dotty.tools
22
package dotc
33
package core
44

5-
import util.common._
65
import Symbols._
76
import Flags._
87
import Names._
@@ -19,7 +18,7 @@ import Decorators._
1918
import Denotations._
2019
import Periods._
2120
import CheckRealizable._
22-
import Variances.{Variance, varianceFromInt, varianceToInt, setStructuralVariances, Invariant}
21+
import Variances.{Variance, setStructuralVariances, Invariant}
2322
import typer.Nullables
2423
import util.Stats._
2524
import util.SimpleIdentitySet
@@ -31,9 +30,7 @@ import Hashable._
3130
import Uniques._
3231
import collection.mutable
3332
import config.Config
34-
import config.Feature
3533
import annotation.{tailrec, constructorOnly}
36-
import language.implicitConversions
3734
import scala.util.hashing.{ MurmurHash3 => hashing }
3835
import config.Printers.{core, typr, matchTypes}
3936
import reporting.{trace, Message}

0 commit comments

Comments
 (0)