@@ -983,25 +983,25 @@ object Types {
983
983
this
984
984
}
985
985
986
- private def dealias (keepAnnots : Boolean )(implicit ctx : Context ): Type = this match {
986
+ private def dealias1 (keepAnnots : Boolean )(implicit ctx : Context ): Type = this match {
987
987
case tp : TypeRef =>
988
988
if (tp.symbol.isClass) tp
989
989
else tp.info match {
990
- case TypeAlias (tp) => tp.dealias (keepAnnots): @ tailrec
990
+ case TypeAlias (tp) => tp.dealias1 (keepAnnots): @ tailrec
991
991
case _ => tp
992
992
}
993
993
case app @ AppliedType (tycon, args) =>
994
- val tycon1 = tycon.dealias (keepAnnots)
995
- if (tycon1 ne tycon) app.superType.dealias (keepAnnots): @ tailrec
994
+ val tycon1 = tycon.dealias1 (keepAnnots)
995
+ if (tycon1 ne tycon) app.superType.dealias1 (keepAnnots): @ tailrec
996
996
else this
997
997
case tp : TypeVar =>
998
998
val tp1 = tp.instanceOpt
999
- if (tp1.exists) tp1.dealias (keepAnnots): @ tailrec else tp
999
+ if (tp1.exists) tp1.dealias1 (keepAnnots): @ tailrec else tp
1000
1000
case tp : AnnotatedType =>
1001
- val tp1 = tp.tpe.dealias (keepAnnots)
1001
+ val tp1 = tp.tpe.dealias1 (keepAnnots)
1002
1002
if (keepAnnots) tp.derivedAnnotatedType(tp1, tp.annot) else tp1
1003
1003
case tp : LazyRef =>
1004
- tp.ref.dealias (keepAnnots): @ tailrec
1004
+ tp.ref.dealias1 (keepAnnots): @ tailrec
1005
1005
case _ => this
1006
1006
}
1007
1007
@@ -1010,14 +1010,14 @@ object Types {
1010
1010
* Goes through annotated types and rewraps annotations on the result.
1011
1011
*/
1012
1012
final def dealiasKeepAnnots (implicit ctx : Context ): Type =
1013
- dealias (keepAnnots = true )
1013
+ dealias1 (keepAnnots = true )
1014
1014
1015
1015
/** Follow aliases and dereferences LazyRefs, annotated types and instantiated
1016
1016
* TypeVars until type is no longer alias type, annotated type, LazyRef,
1017
1017
* or instantiated type variable.
1018
1018
*/
1019
1019
final def dealias (implicit ctx : Context ): Type =
1020
- dealias (keepAnnots = false )
1020
+ dealias1 (keepAnnots = false )
1021
1021
1022
1022
/** Perform successive widenings and dealiasings until none can be applied anymore */
1023
1023
@ tailrec final def widenDealias (implicit ctx : Context ): Type = {
0 commit comments