Skip to content

Commit d981b38

Browse files
committed
Move LambdaType.isImplicit to MethodType.isImplicit
Use Type.isImplicitMethod instead of LambdaType.isImplicit
1 parent 7016468 commit d981b38

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

compiler/src/dotty/tools/dotc/core/Denotations.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ object Denotations {
325325
if (tp1.isInstanceOf[PolyType] && tp2.isInstanceOf[MethodType]) tp2
326326
else if (tp2.isInstanceOf[PolyType] && tp1.isInstanceOf[MethodType]) tp1
327327
else if (ctx.typeComparer.matchingParams(tp1, tp2) &&
328-
tp1.isImplicit == tp2.isImplicit)
328+
tp1.isImplicitMethod == tp2.isImplicitMethod)
329329
tp1.derivedLambdaType(
330330
mergeParamNames(tp1, tp2), tp1.paramInfos,
331331
infoMeet(tp1.resultType, tp2.resultType.subst(tp2, tp1)))
@@ -481,7 +481,7 @@ object Denotations {
481481
tp2 match {
482482
case tp2: MethodOrPoly
483483
if ctx.typeComparer.matchingParams(tp1, tp2) &&
484-
tp1.isImplicit == tp2.isImplicit =>
484+
tp1.isImplicitMethod == tp2.isImplicitMethod =>
485485
tp1.derivedLambdaType(
486486
mergeParamNames(tp1, tp2), tp1.paramInfos,
487487
tp1.resultType | tp2.resultType.subst(tp2, tp1))

compiler/src/dotty/tools/dotc/core/TypeComparer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling {
508508
case tp1: MethodOrPoly =>
509509
(tp1.signature consistentParams tp2.signature) &&
510510
matchingParams(tp1, tp2) &&
511-
tp1.isImplicit == tp2.isImplicit &&
511+
tp1.isImplicitMethod == tp2.isImplicitMethod &&
512512
isSubType(tp1.resultType, tp2.resultType.subst(tp2, tp1))
513513
case _ =>
514514
false

compiler/src/dotty/tools/dotc/core/Types.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,8 +2521,6 @@ object Types {
25212521

25222522
override def resultType(implicit ctx: Context) = resType
25232523

2524-
def isImplicit = false
2525-
25262524
def isDependent(implicit ctx: Context): Boolean
25272525
def isParamDependent(implicit ctx: Context): Boolean
25282526

@@ -2711,7 +2709,7 @@ object Types {
27112709
final def companion: MethodTypeCompanion = MethodType.withKind(kind)
27122710

27132711
final def isJava: Boolean = kind is JavaKind
2714-
final override def isImplicit: Boolean = kind is ImplicitKind
2712+
final def isImplicit: Boolean = kind is ImplicitKind
27152713

27162714
val paramInfos = paramInfosExp(this)
27172715
val resType = resultTypeExp(this)

0 commit comments

Comments
 (0)