Fix rebase breakage

Author: odersky

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

@@ -1720,7 +1720,7 @@ trait Applications extends Compatibility {
      *       a. always as good as a method or a polymorphic method.
      *       b. as good as a member of any other type `tp2` is `asGoodValueType(tp1, tp2) = true`
      */
-    def isAsGood(alt1: TermRef, tp1: Type, alt2: TermRef, tp2: Type): Boolean = trace(i"isAsSpecific $tp1 $tp2", overload) {
+    def isAsGood(alt1: TermRef, tp1: Type, alt2: TermRef, tp2: Type): Boolean = trace(i"isAsGood $tp1 $tp2", overload) {
       tp1 match
         case tp1: MethodType => // (1)
           tp1.paramInfos.isEmpty && tp2.isInstanceOf[LambdaType]
@@ -1876,8 +1876,8 @@ trait Applications extends Compatibility {
     def comparePrefixes =
       val pre1 = widenPrefix(alt1)
       val pre2 = widenPrefix(alt2)
-      val winsPrefix1 = isAsSpecificValueType(pre1, pre2)
-      val winsPrefix2 = isAsSpecificValueType(pre2, pre1)
+      val winsPrefix1 = isAsGoodValueType(pre1, pre2)
+      val winsPrefix2 = isAsGoodValueType(pre2, pre1)
       if winsPrefix1 == winsPrefix2 then 0
       else if winsPrefix1 then 1
       else -1

tests/neg/cb-companion-leaks.check

@@ -1,4 +1,4 @@
--- [E194] Type Error: tests/neg/cb-companion-leaks.scala:9:23 ----------------------------------------------------------
+-- [E195] Type Error: tests/neg/cb-companion-leaks.scala:9:23 ----------------------------------------------------------
 9 |  def foo[A: {C, D}] = A // error
   |                       ^
   |                       context bound companion value A cannot be used as a value
@@ -20,7 +20,7 @@
   | companion value with the (term-)name `A`. However, these context bound companions
   | are not values themselves, they can only be referred to in selections.
    ---------------------------------------------------------------------------------------------------------------------
--- [E194] Type Error: tests/neg/cb-companion-leaks.scala:13:10 ---------------------------------------------------------
+-- [E195] Type Error: tests/neg/cb-companion-leaks.scala:13:10 ---------------------------------------------------------
 13 |  val x = A  // error
    |          ^
    |          context bound companion value A cannot be used as a value
@@ -42,7 +42,7 @@
    | companion value with the (term-)name `A`. However, these context bound companions
    | are not values themselves, they can only be referred to in selections.
     --------------------------------------------------------------------------------------------------------------------
--- [E194] Type Error: tests/neg/cb-companion-leaks.scala:15:9 ----------------------------------------------------------
+-- [E195] Type Error: tests/neg/cb-companion-leaks.scala:15:9 ----------------------------------------------------------
 15 |  val y: A.type = ??? // error
    |         ^
    |         context bound companion value A cannot be used as a value