Rename methods in CanEqual

Author: odersky

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

@@ -841,7 +841,9 @@ class Definitions {
   @tu lazy val TastyReflectionClass: ClassSymbol = requiredClass("scala.tasty.Reflection")
 
   @tu lazy val EqlClass: ClassSymbol = getClassIfDefined("scala.Eql").orElse(requiredClass("scala.CanEqual")).asClass
-    def Eql_eqlAny(using Context): TermSymbol = EqlClass.companionModule.requiredMethod(nme.eqlAny)
+    def Eql_eqlAny(using Context): TermSymbol =
+      val methodName = if EqlClass.name == tpnme.Eql then nme.eqlAny else nme.canEqualAny
+      EqlClass.companionModule.requiredMethod(methodName)
 
   @tu lazy val TypeBoxClass: ClassSymbol = requiredClass("scala.runtime.TypeBox")
     @tu lazy val TypeBox_CAP: TypeSymbol = TypeBoxClass.requiredType(tpnme.CAP)

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

@@ -362,6 +362,7 @@ object StdNames {
     val CAP: N                  = "CAP"
     val Constant: N             = "Constant"
     val ConstantType: N         = "ConstantType"
+    val Eql: N                  = "Eql"
     val EnumValue: N            = "EnumValue"
     val ExistentialTypeTree: N  = "ExistentialTypeTree"
     val Flag : N                = "Flag"
@@ -433,6 +434,7 @@ object StdNames {
     val bundle: N               = "bundle"
     val bytes: N                = "bytes"
     val canEqual_ : N           = "canEqual"
+    val canEqualAny : N         = "canEqualAny"
     val cbnArg: N               = "<cbn-arg>"
     val checkInitialized: N     = "checkInitialized"
     val ClassManifestFactory: N = "ClassManifestFactory"

library/src-bootstrapped/scala/Eql.scala

@@ -20,15 +20,15 @@ object CanEqual {
    *  synthesize implicit arguments as solutions to `CanEqual[T, U]` queries if
    *  the rules of multiversal equality require it.
    */
-  def eqlAny[L, R]: CanEqual[L, R] = derived
+  def canEqualAny[L, R]: CanEqual[L, R] = derived
 
   // Instances of `CanEqual` for common Java types
-  given eqlNumber as CanEqual[Number, Number] = derived
-  given eqlString as CanEqual[String, String] = derived
+  given canEqualNumber as CanEqual[Number, Number] = derived
+  given canEqualString as CanEqual[String, String] = derived
 
   // The next three definitions can go into the companion objects of classes
   // Seq and Set. For now they are here in order not to have to touch the
   // source code of these classes
-  given eqlSeq[T, U](using eq: CanEqual[T, U]) as CanEqual[Seq[T], Seq[U]] = derived
-  given eqlSet[T, U](using eq: CanEqual[T, U]) as CanEqual[Set[T], Set[U]] = derived
+  given canEqualSeq[T, U](using eq: CanEqual[T, U]) as CanEqual[Seq[T], Seq[U]] = derived
+  given canEqualSet[T, U](using eq: CanEqual[T, U]) as CanEqual[Set[T], Set[U]] = derived
 }