Skip to content

Commit 4cab4f1

Browse files
oderskyodersky
committed
Remove unused imports
1 parent ca5b512 commit 4cab4f1

File tree

3 files changed

+24
-74
lines changed

3 files changed

+24
-74
lines changed

‎compiler/src/dotty/tools/dotc/inlines/InlineReducer.scala

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,17 @@ package dotty.tools
22
package dotc
33
package inlines
44

5-
import core._
6-
import ast.*
7-
import Flags._
8-
import Symbols._
9-
import Types._
10-
import Decorators._
11-
import Constants._
12-
import StagingContext._
13-
import StdNames._
14-
import transform.SymUtils._
5+
import ast.*, core.*
6+
import Flags.*, Symbols.*, Types.*, Decorators.*, Contexts.*
7+
import StdNames.nme
8+
import transform.SymUtils.*
159
import typer.*
16-
import Contexts._
17-
import Names.{Name, TermName}
18-
import NameKinds.{InlineAccessorName, InlineBinderName, InlineScrutineeName, BodyRetainerName}
19-
import ProtoTypes.shallowSelectionProto
20-
import SymDenotations.SymDenotation
21-
import Inferencing.isFullyDefined
22-
import Scopes.newScope
10+
import Names.TermName
11+
import NameKinds.{InlineAccessorName, InlineBinderName, InlineScrutineeName}
2312
import config.Printers.inlining
24-
import config.Feature
25-
import ErrorReporting.errorTree
26-
import dotty.tools.dotc.util.{SimpleIdentityMap, SimpleIdentitySet, SourceFile, SourcePosition, SrcPos}
27-
import dotty.tools.dotc.parsing.Parsers.Parser
28-
import Nullables._
29-
import transform.{PostTyper, Inlining, CrossVersionChecks}
13+
import util.SimpleIdentityMap
3014

3115
import collection.mutable
32-
import reporting.trace
33-
import util.Spans.Span
34-
import dotty.tools.dotc.transform.Splicer
35-
import quoted.QuoteUtils
36-
37-
import scala.annotation.constructorOnly
3816

3917
/** A utility object offering methods for rewriting inlined code */
4018
class InlineReducer(inliner: Inliner)(using Context):

‎compiler/src/dotty/tools/dotc/inlines/Inliner.scala

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,29 @@ package dotty.tools
22
package dotc
33
package inlines
44

5-
import ast.{TreeInfo, tpd, _}
6-
import core._
7-
import Flags._
8-
import Symbols._
9-
import Types._
10-
import Decorators._
11-
import Constants._
12-
import StagingContext._
13-
import StdNames._
14-
import transform.SymUtils._
5+
import ast.*, core.*
6+
import Flags.*, Symbols.*, Types.*, Decorators.*, Constants.*, Contexts.*
7+
import transform.SymUtils.*
8+
import StdNames.nme
159
import typer.*
16-
import Contexts._
17-
import Names.{Name, TermName}
18-
import NameKinds.{InlineAccessorName, InlineBinderName, InlineScrutineeName, BodyRetainerName}
10+
import Names.Name
11+
import NameKinds.InlineBinderName
1912
import ProtoTypes.shallowSelectionProto
2013
import SymDenotations.SymDenotation
2114
import Inferencing.isFullyDefined
22-
import Scopes.newScope
2315
import config.Printers.inlining
24-
import config.Feature
2516
import ErrorReporting.errorTree
26-
import dotty.tools.dotc.util.{SimpleIdentityMap, SimpleIdentitySet, SourceFile, SourcePosition, SrcPos}
27-
import dotty.tools.dotc.parsing.Parsers.Parser
28-
import Nullables._
29-
import transform.{PostTyper, Inlining, CrossVersionChecks}
17+
import util.{SimpleIdentitySet, SrcPos}
18+
import Nullables.computeNullableDeeply
3019

3120
import collection.mutable
3221
import reporting.trace
3322
import util.Spans.Span
3423
import dotty.tools.dotc.transform.Splicer
3524
import quoted.QuoteUtils
36-
3725
import scala.annotation.constructorOnly
3826

27+
/** General support for inlining */
3928
object Inliner:
4029
import tpd._
4130

@@ -813,7 +802,7 @@ class Inliner(val call: tpd.Tree)(using Context):
813802
case _ => tree
814803
val res = cancelQuotes(constToLiteral(betaReduce(super.typedApply(tree, pt)))) match {
815804
case res: Apply if res.symbol == defn.QuotedRuntime_exprSplice
816-
&& level == 0
805+
&& StagingContext.level == 0
817806
&& !hasInliningErrors =>
818807
val expanded = expandMacro(res.args.head, tree.srcPos)
819808
typedExpr(expanded) // Inline calls and constant fold code generated by the macro
@@ -1023,7 +1012,7 @@ class Inliner(val call: tpd.Tree)(using Context):
10231012
}
10241013

10251014
private def expandMacro(body: Tree, splicePos: SrcPos)(using Context) = {
1026-
assert(level == 0)
1015+
assert(StagingContext.level == 0)
10271016
val inlinedFrom = enclosingInlineds.last
10281017
val dependencies = macroDependencies(body)
10291018
val suspendable = ctx.compilationUnit.isSuspendable

‎compiler/src/dotty/tools/dotc/inlines/Inlines.scala

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,22 @@ package dotty.tools
22
package dotc
33
package inlines
44

5-
import ast.{TreeInfo, tpd, _}
6-
import core._
7-
import Flags._
8-
import Symbols._
9-
import Types._
10-
import Decorators._
11-
import Constants._
12-
import StagingContext._
13-
import StdNames._
5+
import ast.*, core.*
6+
import Flags.*, Symbols.*, Types.*, Decorators.*, Constants.*, Contexts.*
7+
import StdNames.tpnme
148
import transform.SymUtils._
159
import typer.*
16-
import Contexts._
17-
import Names.{Name, TermName}
18-
import NameKinds.{InlineAccessorName, InlineBinderName, InlineScrutineeName, BodyRetainerName}
19-
import ProtoTypes.shallowSelectionProto
10+
import NameKinds.BodyRetainerName
2011
import SymDenotations.SymDenotation
21-
import Inferencing.isFullyDefined
22-
import Scopes.newScope
2312
import config.Printers.inlining
24-
import config.Feature
2513
import ErrorReporting.errorTree
26-
import dotty.tools.dotc.util.{SimpleIdentityMap, SimpleIdentitySet, SourceFile, SourcePosition, SrcPos}
27-
import dotty.tools.dotc.parsing.Parsers.Parser
28-
import Nullables._
14+
import dotty.tools.dotc.util.{SourceFile, SourcePosition, SrcPos}
15+
import parsing.Parsers.Parser
2916
import transform.{PostTyper, Inlining, CrossVersionChecks}
3017

3118
import collection.mutable
3219
import reporting.trace
3320
import util.Spans.Span
34-
import dotty.tools.dotc.transform.Splicer
35-
import quoted.QuoteUtils
36-
37-
import scala.annotation.constructorOnly
3821

3922
object Inlines:
4023
import tpd._

0 commit comments

Comments
 (0)