Skip to content

Commit f3b66e1

Browse files
som-snyttsom-snytt
committed
Edit unused imports
1 parent 4f3d767 commit f3b66e1

File tree

262 files changed

+119
-725
lines changed

Some content is hidden

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

262 files changed

+119
-725
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ package dotty.tools
33

44
import scala.annotation.tailrec
55
import scala.io.Source
6-
import scala.util.{ Try, Success, Failure }
6+
import scala.util.Try
77
import java.io.File
88
import java.lang.Thread
99
import scala.annotation.internal.sharable
1010
import dotty.tools.dotc.util.ClasspathFromClassloader
1111
import dotty.tools.runner.ObjectRunner
1212
import dotty.tools.dotc.config.Properties.envOrNone
13-
import java.util.jar._
1413
import dotty.tools.io.Jar
1514
import dotty.tools.runner.ScalaClassLoader
16-
import java.nio.file.{Files, Paths, Path}
15+
import java.nio.file.Paths
1716
import dotty.tools.dotc.config.CommandLineParser
1817
import dotty.tools.scripting.StringDriver
1918

‎compiler/src/dotty/tools/backend/WorklistAlgorithm.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package dotty.tools
22
package backend
33

4-
import scala.collection.mutable
5-
64
/**
75
* Simple implementation of a worklist algorithm. A processing
86
* function is applied repeatedly to the first element in the

‎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/jvm/scalaPrimitives.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import dotc.report
1212
import dotc.util.ReadOnlyMap
1313

1414
import scala.annotation.threadUnsafe
15-
import scala.collection.immutable
16-
1715

1816
/** Scala primitive operations are represented as methods in `Any` and
1917
* `AnyVal` subclasses. Here we demultiplex them by providing a mapping

‎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/backend/sjs/JSEncoding.scala

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
package dotty.tools.backend.sjs
22

3-
import scala.annotation.tailrec
4-
53
import scala.collection.mutable
64

7-
import dotty.tools.FatalError
8-
95
import dotty.tools.dotc.core._
10-
import Decorators._
11-
import Periods._
12-
import SymDenotations._
136
import Contexts._
147
import Flags._
158
import Types._
169
import Symbols._
17-
import Denotations._
1810
import NameOps._
1911
import Names._
2012
import StdNames._
@@ -28,9 +20,6 @@ import org.scalajs.ir.OriginalName
2820
import org.scalajs.ir.OriginalName.NoOriginalName
2921
import org.scalajs.ir.UTF8String
3022

31-
import ScopedVar.withScopedVars
32-
import JSDefinitions._
33-
3423
import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
3524

3625
/** Encoding of symbol names for JavaScript

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import scala.annotation.tailrec
44

55
import scala.collection.mutable
66

7-
import dotty.tools.dotc.ast.Trees._
87
import dotty.tools.dotc.core._
98

109
import Contexts._
@@ -14,23 +13,16 @@ import Flags._
1413
import Names._
1514
import NameKinds.DefaultGetterName
1615
import NameOps._
17-
import Periods._
1816
import Phases._
19-
import StdNames._
2017
import Symbols._
21-
import SymDenotations._
2218
import Types._
2319
import TypeErasure.ErasedValueType
2420

25-
import dotty.tools.dotc.transform.Erasure
2621
import dotty.tools.dotc.util.{SourcePosition, SrcPos}
27-
import dotty.tools.dotc.util.Spans.Span
2822
import dotty.tools.dotc.report
2923

30-
import org.scalajs.ir
31-
import org.scalajs.ir.{ClassKind, Position, Names => jsNames, Trees => js, Types => jstpe}
32-
import org.scalajs.ir.Names.{ClassName, DefaultModuleID, MethodName, SimpleMethodName}
33-
import org.scalajs.ir.OriginalName
24+
import org.scalajs.ir.{Position, Names => jsNames, Trees => js, Types => jstpe}
25+
import org.scalajs.ir.Names.DefaultModuleID
3426
import org.scalajs.ir.OriginalName.NoOriginalName
3527
import org.scalajs.ir.Position.NoPosition
3628
import org.scalajs.ir.Trees.OptimizerHints

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package dotty.tools.backend.sjs
22

33
import dotty.tools.dotc.core._
44
import Names.TermName
5-
import StdNames._
65
import Types._
76
import Contexts._
87
import Symbols._
@@ -12,8 +11,6 @@ import dotty.tools.backend.jvm.DottyPrimitives
1211
import dotty.tools.dotc.report
1312
import dotty.tools.dotc.util.ReadOnlyMap
1413

15-
import scala.collection.mutable
16-
1714
object JSPrimitives {
1815

1916
inline val FirstJSPrimitiveCode = 300
@@ -60,7 +57,6 @@ object JSPrimitives {
6057

6158
class JSPrimitives(ictx: Context) extends DottyPrimitives(ictx) {
6259
import JSPrimitives._
63-
import dotty.tools.backend.ScalaPrimitivesOps._
6460

6561
private lazy val jsPrimitives: ReadOnlyMap[Symbol, Int] = initJSPrimitives(using ictx)
6662

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package dotty.tools.backend.sjs
22

3-
import language.implicitConversions
4-
53
class ScopedVar[A](init: A) {
64
import ScopedVar.Assignment
75

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import util.{FreshNameCreator, SourceFile, NoSource}
99
import util.Spans.Span
1010
import ast.{tpd, untpd}
1111
import tpd.{Tree, TreeTraverser}
12-
import typer.PrepareInlineable.InlineAccessors
1312
import typer.Nullables
1413
import transform.SymUtils._
1514
import core.Decorators._

0 commit comments

Comments
 (0)