File tree Expand file tree Collapse file tree 4 files changed +9
-10
lines changed
compiler/src/dotty/tools/dotc Expand file tree Collapse file tree 4 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -159,7 +159,6 @@ class TreeBuffer extends TastyBuffer(50000) {
159
159
val tree = it.next
160
160
treeAddrs.get(tree) match {
161
161
case addr : Addr => treeAddrs.put(tree, adjusted(addr))
162
- case addrs : List [Addr @ unchecked] => treeAddrs.put(tree, addrs.map(adjusted))
163
162
}
164
163
}
165
164
}
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ package dotty.tools.dotc
2
2
package transform
3
3
4
4
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 }
6
6
import scala .collection .{ mutable , immutable }
7
7
import ValueClasses ._
8
8
import scala .annotation .tailrec
@@ -258,15 +258,15 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisTran
258
258
)
259
259
case Import (expr, selectors) =>
260
260
val exprTpe = expr.tpe
261
- def checkIdent (ident : Ident ): Unit = {
261
+ def checkIdent (ident : untpd. Ident ): Unit = {
262
262
val name = ident.name.asTermName.encode
263
263
if (name != nme.WILDCARD && ! exprTpe.member(name).exists && ! exprTpe.member(name.toTypeName).exists)
264
264
ctx.error(s " ${ident.name} is not a member of ${expr.show}" , ident.pos)
265
265
}
266
266
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 _ =>
270
270
}
271
271
super .transform(tree)
272
272
case tree =>
Original file line number Diff line number Diff line change @@ -139,13 +139,13 @@ class TreeChecker extends Phase with SymTransformer {
139
139
class Checker (phasesToCheck : Seq [Phase ]) extends ReTyper with Checking {
140
140
141
141
val nowDefinedSyms = new mutable.HashSet [Symbol ]
142
- val everDefinedSyms = new mutable.HashMap [Symbol , Tree ]
142
+ val everDefinedSyms = new mutable.HashMap [Symbol , untpd. Tree ]
143
143
144
144
// don't check value classes after typer, as the constraint about constructors doesn't hold after transform
145
145
override def checkDerivedValueClass (clazz : Symbol , stats : List [Tree ])(implicit ctx : Context ) = ()
146
146
147
147
def withDefinedSym [T ](tree : untpd.Tree )(op : => T )(implicit ctx : Context ): T = tree match {
148
- case tree : DefTree @ unchecked =>
148
+ case tree : untpd. DefTree =>
149
149
val sym = tree.symbol
150
150
assert(isValidJVMName(sym.name), s " ${sym.fullName} name is invalid on jvm " )
151
151
everDefinedSyms.get(sym) match {
@@ -160,7 +160,7 @@ class TreeChecker extends Phase with SymTransformer {
160
160
161
161
if (ctx.settings.YcheckMods .value) {
162
162
tree match {
163
- case t : MemberDef =>
163
+ case t : untpd. MemberDef =>
164
164
if (t.name ne sym.name) ctx.warning(s " symbol ${sym.fullName} name doesn't correspond to AST: ${t}" )
165
165
// todo: compare trees inside annotations
166
166
case _ =>
Original file line number Diff line number Diff line change @@ -539,7 +539,7 @@ object ProtoTypes {
539
539
/** Dummy tree to be used as an argument of a FunProto or ViewProto type */
540
540
object dummyTreeOfType {
541
541
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 {
543
543
case Literal (Constant (null )) => Some (tree.typeOpt)
544
544
case _ => None
545
545
}
You can’t perform that action at this time.
0 commit comments