Rename ImplicitMethodType -> OldImplicitMethodType

Author: odersky

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

@@ -71,7 +71,7 @@ object Types {
    *        +- GroundType -+- AndType
    *                       +- OrType
    *                       +- MethodOrPoly ---+-- PolyType
-   *                       |                  +-- MethodType ---+- ImplicitMethodType
+   *                       |                  +-- MethodType ---+- OldImplicitMethodType
    *                       |                                    +- GivenMethodType
    *                       |                                    +- ErasedMethodType
    *                       |                                    +- JavaMethodType
@@ -3184,12 +3184,12 @@ object Types {
 
     final override def isJavaMethod: Boolean = companion eq JavaMethodType
     final override def isImplicitMethod: Boolean =
-      companion.eq(ImplicitMethodType) ||
-      companion.eq(ErasedImplicitMethodType) ||
+      companion.eq(OldImplicitMethodType) ||
+      companion.eq(ErasedOldImplicitMethodType) ||
       isGivenMethod
     final override def isErasedMethod: Boolean =
       companion.eq(ErasedMethodType) ||
-      companion.eq(ErasedImplicitMethodType) ||
+      companion.eq(ErasedOldImplicitMethodType) ||
       companion.eq(ErasedGivenMethodType)
     final override def isGivenMethod: Boolean =
       companion.eq(GivenMethodType) ||
@@ -3296,7 +3296,7 @@ object Types {
       else if (isGiven)
         if (isErased) ErasedGivenMethodType else GivenMethodType
       else if (isOldImplicit)
-        if (isErased) ErasedImplicitMethodType else ImplicitMethodType
+        if (isErased) ErasedOldImplicitMethodType else OldImplicitMethodType
       else
         if (isErased) ErasedMethodType else MethodType
     }
@@ -3305,8 +3305,8 @@ object Types {
   object ErasedMethodType extends MethodTypeCompanion("ErasedMethodType")
   object GivenMethodType extends MethodTypeCompanion("GivenMethodType")
   object ErasedGivenMethodType extends MethodTypeCompanion("ErasedGivenMethodType")
-  object ImplicitMethodType extends MethodTypeCompanion("ImplicitMethodType")
-  object ErasedImplicitMethodType extends MethodTypeCompanion("ErasedImplicitMethodType")
+  object OldImplicitMethodType extends MethodTypeCompanion("ImplicitMethodType")
+  object ErasedOldImplicitMethodType extends MethodTypeCompanion("ErasedImplicitMethodType")
 
   /** A ternary extractor for MethodType */
   object MethodTpe {

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

@@ -356,7 +356,7 @@ class TreeUnpickler(reader: TastyReader,
             case ERASEDGIVENMETHODtype =>
               readMethodic(ErasedGivenMethodType, _.toTermName)
             case IMPLICITMETHODtype =>
-              readMethodic(ImplicitMethodType, _.toTermName)
+              readMethodic(OldImplicitMethodType, _.toTermName)
             case TYPELAMBDAtype =>
               readMethodic(HKTypeLambda, _.toTypeName)
             case PARAMtype =>

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

@@ -159,7 +159,7 @@ trait Deriving { this: Typer =>
      *  where `T_1, ..., T_n` are the first-kinded type parameters in `Ts`,
      *  the typeclass instance has the form
      *
-     *      implicit def derived$D(implicit ev_1: D[T_1], ..., ev_n: D[T_n]): D[C[Ts]] = D.derived
+     *      implicit def derived$D given (ev_1: D[T_1], ..., ev_n: D[T_n]): D[C[Ts]] = D.derived
      *
      *  See the body of this method for how to generalize this to typeclasses with more
      *  or less than one type parameter.
@@ -219,7 +219,7 @@ trait Deriving { this: Typer =>
         val clsParams: List[TypeSymbol] = clsParamss.flatten
         val instanceInfo =
           if (clsParams.isEmpty) ExprType(resultType)
-          else PolyType.fromParams(clsParams, ImplicitMethodType(evidenceParamInfos, resultType))
+          else PolyType.fromParams(clsParams, GivenMethodType(evidenceParamInfos, resultType))
         addDerivedInstance(originalType.typeSymbol.name, instanceInfo, derived.sourcePos, reportErrors = true)
       }
     }