Skip to content

Edit unused imports #14533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions compiler/src/dotty/tools/MainGenericRunner.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ package dotty.tools

import scala.annotation.tailrec
import scala.io.Source
import scala.util.{ Try, Success, Failure }
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 java.util.jar._
import dotty.tools.io.Jar
import dotty.tools.runner.ScalaClassLoader
import java.nio.file.{Files, Paths, Path}
import java.nio.file.Paths
import dotty.tools.dotc.config.CommandLineParser
import dotty.tools.scripting.StringDriver

Expand Down
2 changes: 0 additions & 2 deletions compiler/src/dotty/tools/backend/WorklistAlgorithm.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package dotty.tools
package backend

import scala.collection.mutable

/**
* Simple implementation of a worklist algorithm. A processing
* function is applied repeatedly to the first element in the
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import dotty.tools.dotc.report
* the compiler cake (Global).
*/
final class BCodeAsmCommon[I <: DottyBackendInterface](val interface: I) {
import interface.{_, given}
import interface.given
import DottyBackendInterface.symExtensions

/**
Expand Down
4 changes: 1 addition & 3 deletions compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import scala.annotation.switch
import scala.collection.mutable.SortedMap

import scala.tools.asm
import scala.tools.asm.{Handle, Label, Opcodes}
import scala.tools.asm.{Handle, Opcodes}
import BCodeHelpers.InvokeStyle

import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.CompilationUnit
import dotty.tools.dotc.core.Constants._
import dotty.tools.dotc.core.Decorators._
import dotty.tools.dotc.core.Flags.{Label => LabelFlag, _}
import dotty.tools.dotc.core.Types._
import dotty.tools.dotc.core.StdNames.{nme, str}
Expand Down Expand Up @@ -915,7 +914,6 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
var default: asm.Label = null
var indirectBlocks: List[(asm.Label, Tree)] = Nil

import scala.collection.mutable

// Cases grouped by their hashCode
val casesByHash = SortedMap.empty[Int, List[(String, Either[asm.Label, Tree])]]
Expand Down
3 changes: 1 addition & 2 deletions compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
@threadUnsafe lazy val JavaAnnotationClass: ClassSymbol = requiredClass("java.lang.annotation.Annotation")

val bCodeAsmCommon: BCodeAsmCommon[int.type] = new BCodeAsmCommon(int)
import bCodeAsmCommon._

/*
* must-single-thread
Expand Down Expand Up @@ -479,7 +478,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
} // end of trait BCAnnotGen

trait BCJGenSigGen {
import int.{_, given}
import int.given

def getCurrentCUnit(): CompilationUnit

Expand Down
1 change: 0 additions & 1 deletion compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package jvm

import scala.tools.asm
import scala.annotation.switch
import scala.collection.mutable
import Primitives.{NE, EQ, TestOp, ArithmeticOp}
import scala.tools.asm.tree.MethodInsnNode
import dotty.tools.dotc.report
Expand Down
4 changes: 0 additions & 4 deletions compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@ package backend
package jvm

import scala.collection.{ mutable, immutable }
import scala.annotation.switch

import scala.tools.asm
import scala.tools.asm.util.{TraceMethodVisitor, ASMifier}
import java.io.PrintWriter

import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.ast.TreeTypeMap
import dotty.tools.dotc.CompilationUnit
import dotty.tools.dotc.core.Annotations.Annotation
import dotty.tools.dotc.core.Decorators._
import dotty.tools.dotc.core.Flags._
import dotty.tools.dotc.core.StdNames._
Expand Down
3 changes: 1 addition & 2 deletions compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import dotty.tools.dotc.CompilationUnit
import dotty.tools.dotc.core.StdNames.nme
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.ast.tpd.TreeOps

/*
*
Expand All @@ -18,7 +17,7 @@ import dotty.tools.dotc.ast.tpd.TreeOps
*
*/
trait BCodeSyncAndTry extends BCodeBodyBuilder {
import int.{_, given}
import int.given
import tpd._
import bTypes._
import coreBTypes._
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/backend/jvm/BTypes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import scala.tools.asm
abstract class BTypes {

val int: DottyBackendInterface
import int.{_, given}
import int.given
/**
* A map from internal names to ClassBTypes. Every ClassBType is added to this map on its
* construction.
Expand Down
5 changes: 1 addition & 4 deletions compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ package dotty.tools
package backend
package jvm

import java.io.{ DataOutputStream, FileOutputStream, IOException, OutputStream, File => JFile }
import java.io.{ DataOutputStream, FileOutputStream, IOException, File as JFile }
import java.nio.channels.ClosedByInterruptException
import java.nio.file.Files
import dotty.tools.io._
import dotty.tools.dotc.report

import java.util.jar.Attributes.Name
import scala.language.postfixOps

/** Can't output a file due to the state of the file system. */
class FileConflictException(msg: String, val file: AbstractFile) extends IOException(msg)
Expand Down
5 changes: 1 addition & 4 deletions compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ package dotty.tools
package backend
package jvm

import scala.annotation.switch

import dotty.tools.dotc.core.Decorators._
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.transform.Erasure

Expand Down Expand Up @@ -33,7 +31,7 @@ import dotty.tools.dotc.transform.Erasure
*/
class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTypes: BTFS) {
import bTypes._
import int.{_, given}
import int.given
import DottyBackendInterface._

//import global._
Expand Down Expand Up @@ -212,7 +210,6 @@ trait CoreBTypesProxyGlobalIndependent[BTS <: BTypes] {
*/
final class CoreBTypesProxy[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTypes: BTFS) extends CoreBTypesProxyGlobalIndependent[BTFS] {
import bTypes._
import bTypes.int._

private var _coreBTypes: CoreBTypes[bTypes.type] = _
def setBTypes(coreBTypes: CoreBTypes[BTFS]): Unit = {
Expand Down
19 changes: 3 additions & 16 deletions compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
Original file line number Diff line number Diff line change
@@ -1,38 +1,25 @@
package dotty.tools.backend.jvm

import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.ast.Trees
import dotty.tools.dotc
import dotty.tools.dotc.core.Flags._
import dotty.tools.dotc.transform.{Erasure, GenericSignatures}
import dotty.tools.dotc.transform.SymUtils._
import java.io.{File => _}

import scala.annotation.threadUnsafe
import scala.collection.generic.Clearable
import scala.collection.mutable
import scala.reflect.ClassTag
import dotty.tools.io.AbstractFile
import scala.tools.asm.AnnotationVisitor
import dotty.tools.dotc.core._
import Contexts._
import Types._
import Symbols._
import Phases._

import dotty.tools.dotc.util
import dotty.tools.dotc.util.{Spans, ReadOnlyMap}
import dotty.tools.dotc.util.ReadOnlyMap
import dotty.tools.dotc.report

import Decorators._
import Constants._
import tpd._

import scala.tools.asm
import StdNames.{nme, str}
import NameKinds.{DefaultGetterName, ExpandedName, LazyBitMapName}
import Names.TermName
import Annotations.Annotation
import StdNames.nme
import NameKinds.LazyBitMapName
import Names.Name

class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap: ReadOnlyMap[Symbol, Set[ClassSymbol]])(using val ctx: Context) {
Expand Down
1 change: 0 additions & 1 deletion compiler/src/dotty/tools/backend/jvm/GenBCode.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import dotty.tools.dotc.sbt.ExtractDependencies
import Contexts._
import Phases._
import Symbols._
import Decorators._

import java.io.DataOutputStream
import java.nio.channels.ClosedByInterruptException
Expand Down
2 changes: 0 additions & 2 deletions compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import dotc.report
import dotc.util.ReadOnlyMap

import scala.annotation.threadUnsafe
import scala.collection.immutable


/** Scala primitive operations are represented as methods in `Any` and
* `AnyVal` subclasses. Here we demultiplex them by providing a mapping
Expand Down
7 changes: 0 additions & 7 deletions compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,22 @@ import dotty.tools.FatalError

import dotty.tools.dotc.CompilationUnit
import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.core.Phases.Phase

import dotty.tools.dotc.core._
import Periods._
import SymDenotations._
import Contexts._
import Decorators._
import Flags._
import dotty.tools.dotc.ast.Trees._
import Names._
import NameKinds.DefaultGetterName
import Types._
import Symbols._
import Denotations._
import Phases._
import StdNames._
import TypeErasure.ErasedValueType

import dotty.tools.dotc.transform.{Erasure, ValueClasses}
import dotty.tools.dotc.transform.SymUtils._
import dotty.tools.dotc.util.SourcePosition
import dotty.tools.dotc.util.Spans.Span
import dotty.tools.dotc.report

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

implicit val pos: SourcePosition = tree.sourcePos

Expand Down
2 changes: 0 additions & 2 deletions compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import scala.annotation.threadUnsafe
import Types._
import Contexts._
import Symbols._
import Names._
import StdNames._
import Decorators._

import dotty.tools.dotc.config.SJSPlatform

Expand Down
11 changes: 0 additions & 11 deletions compiler/src/dotty/tools/backend/sjs/JSEncoding.scala
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
package dotty.tools.backend.sjs

import scala.annotation.tailrec

import scala.collection.mutable

import dotty.tools.FatalError

import dotty.tools.dotc.core._
import Decorators._
import Periods._
import SymDenotations._
import Contexts._
import Flags._
import Types._
import Symbols._
import Denotations._
import NameOps._
import Names._
import StdNames._
Expand All @@ -28,9 +20,6 @@ import org.scalajs.ir.OriginalName
import org.scalajs.ir.OriginalName.NoOriginalName
import org.scalajs.ir.UTF8String

import ScopedVar.withScopedVars
import JSDefinitions._

import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions

/** Encoding of symbol names for JavaScript
Expand Down
12 changes: 2 additions & 10 deletions compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import scala.annotation.tailrec

import scala.collection.mutable

import dotty.tools.dotc.ast.Trees._
import dotty.tools.dotc.core._

import Contexts._
Expand All @@ -14,23 +13,16 @@ import Flags._
import Names._
import NameKinds.DefaultGetterName
import NameOps._
import Periods._
import Phases._
import StdNames._
import Symbols._
import SymDenotations._
import Types._
import TypeErasure.ErasedValueType

import dotty.tools.dotc.transform.Erasure
import dotty.tools.dotc.util.{SourcePosition, SrcPos}
import dotty.tools.dotc.util.Spans.Span
import dotty.tools.dotc.report

import org.scalajs.ir
import org.scalajs.ir.{ClassKind, Position, Names => jsNames, Trees => js, Types => jstpe}
import org.scalajs.ir.Names.{ClassName, DefaultModuleID, MethodName, SimpleMethodName}
import org.scalajs.ir.OriginalName
import org.scalajs.ir.{Position, Names => jsNames, Trees => js, Types => jstpe}
import org.scalajs.ir.Names.DefaultModuleID
import org.scalajs.ir.OriginalName.NoOriginalName
import org.scalajs.ir.Position.NoPosition
import org.scalajs.ir.Trees.OptimizerHints
Expand Down
4 changes: 0 additions & 4 deletions compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package dotty.tools.backend.sjs

import dotty.tools.dotc.core._
import Names.TermName
import StdNames._
import Types._
import Contexts._
import Symbols._
Expand All @@ -12,8 +11,6 @@ import dotty.tools.backend.jvm.DottyPrimitives
import dotty.tools.dotc.report
import dotty.tools.dotc.util.ReadOnlyMap

import scala.collection.mutable

object JSPrimitives {

inline val FirstJSPrimitiveCode = 300
Expand Down Expand Up @@ -60,7 +57,6 @@ object JSPrimitives {

class JSPrimitives(ictx: Context) extends DottyPrimitives(ictx) {
import JSPrimitives._
import dotty.tools.backend.ScalaPrimitivesOps._

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

Expand Down
2 changes: 0 additions & 2 deletions compiler/src/dotty/tools/backend/sjs/ScopedVar.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package dotty.tools.backend.sjs

import language.implicitConversions

class ScopedVar[A](init: A) {
import ScopedVar.Assignment

Expand Down
1 change: 0 additions & 1 deletion compiler/src/dotty/tools/dotc/CompilationUnit.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import util.{FreshNameCreator, SourceFile, NoSource}
import util.Spans.Span
import ast.{tpd, untpd}
import tpd.{Tree, TreeTraverser}
import typer.PrepareInlineable.InlineAccessors
import typer.Nullables
import transform.SymUtils._
import core.Decorators._
Expand Down
Loading