Skip to content

Commit fee6953

Browse files
committed
Addresses review comments
1 parent 4aba4f7 commit fee6953

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ class TreeBuffer extends TastyBuffer(50000) {
159159
val tree = it.next
160160
treeAddrs.get(tree) match {
161161
case addr: Addr => treeAddrs.put(tree, adjusted(addr))
162-
case addrs: List[Addr @unchecked] => treeAddrs.put(tree, addrs.map(adjusted))
163162
}
164163
}
165164
}

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.dotc
22
package transform
33

44
import dotty.tools.dotc.transform.TreeTransforms.{TransformerInfo, TreeTransform, TreeTransformer}
5-
import dotty.tools.dotc.ast.{Trees, tpd}
5+
import dotty.tools.dotc.ast.{Trees, tpd, untpd}
66
import scala.collection.{ mutable, immutable }
77
import ValueClasses._
88
import scala.annotation.tailrec
@@ -258,15 +258,15 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisTran
258258
)
259259
case Import(expr, selectors) =>
260260
val exprTpe = expr.tpe
261-
def checkIdent(ident: Ident): Unit = {
261+
def checkIdent(ident: untpd.Ident): Unit = {
262262
val name = ident.name.asTermName.encode
263263
if (name != nme.WILDCARD && !exprTpe.member(name).exists && !exprTpe.member(name.toTypeName).exists)
264264
ctx.error(s"${ident.name} is not a member of ${expr.show}", ident.pos)
265265
}
266266
selectors.foreach {
267-
case ident @ Ident(_) => checkIdent(ident)
268-
case Thicket((ident @ Ident(_)) :: _) => checkIdent(ident)
269-
case _ =>
267+
case ident: untpd.Ident => checkIdent(ident)
268+
case Thicket((ident: untpd.Ident) :: _) => checkIdent(ident)
269+
case _ =>
270270
}
271271
super.transform(tree)
272272
case tree =>

compiler/src/dotty/tools/dotc/transform/TreeChecker.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ class TreeChecker extends Phase with SymTransformer {
139139
class Checker(phasesToCheck: Seq[Phase]) extends ReTyper with Checking {
140140

141141
val nowDefinedSyms = new mutable.HashSet[Symbol]
142-
val everDefinedSyms = new mutable.HashMap[Symbol, Tree]
142+
val everDefinedSyms = new mutable.HashMap[Symbol, untpd.Tree]
143143

144144
// don't check value classes after typer, as the constraint about constructors doesn't hold after transform
145145
override def checkDerivedValueClass(clazz: Symbol, stats: List[Tree])(implicit ctx: Context) = ()
146146

147147
def withDefinedSym[T](tree: untpd.Tree)(op: => T)(implicit ctx: Context): T = tree match {
148-
case tree: DefTree @unchecked =>
148+
case tree: untpd.DefTree =>
149149
val sym = tree.symbol
150150
assert(isValidJVMName(sym.name), s"${sym.fullName} name is invalid on jvm")
151151
everDefinedSyms.get(sym) match {
@@ -160,7 +160,7 @@ class TreeChecker extends Phase with SymTransformer {
160160

161161
if (ctx.settings.YcheckMods.value) {
162162
tree match {
163-
case t: MemberDef =>
163+
case t: untpd.MemberDef =>
164164
if (t.name ne sym.name) ctx.warning(s"symbol ${sym.fullName} name doesn't correspond to AST: ${t}")
165165
// todo: compare trees inside annotations
166166
case _ =>

compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ object ProtoTypes {
539539
/** Dummy tree to be used as an argument of a FunProto or ViewProto type */
540540
object dummyTreeOfType {
541541
def apply(tp: Type): Tree = untpd.Literal(Constant(null)) withTypeUnchecked tp
542-
def unapply(tree: Tree @unchecked): Option[Type] = tree match {
542+
def unapply(tree: untpd.Tree): Option[Type] = tree match {
543543
case Literal(Constant(null)) => Some(tree.typeOpt)
544544
case _ => None
545545
}

0 commit comments

Comments
 (0)