Remove defn.DependentFunctionRefinementOf

Author: nicolasstucki

compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala

@@ -705,7 +705,7 @@ class CheckCaptures extends Recheck, SymTransformer:
           else CapturingType(eparent1, refs, boxed = expected0.isBoxed)
         case defn.FunctionOf(mt: MethodType) =>
           actual match
-            case defn.DependentFunctionRefinementOf(_) =>
+            case defn.FunctionOf(mt2: MethodType) if mt2.isResultDependent =>
               mt.toFunctionType(isJava = false, alwaysDependent = true)
             case _ =>
               expected

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

@@ -1123,8 +1123,9 @@ class Definitions {
      */
     def unapply(ft: Type)(using Context): Option[MethodOrPoly] = {
       ft match
-        case PolyFunctionOf(mt) => Some(mt)
-        case DependentFunctionRefinementOf(mt) => Some(mt)
+        case RefinedType(parent, nme.apply, mt: MethodOrPoly)
+        if parent.derivesFrom(defn.PolyFunctionClass) || (isFunctionNType(parent) && mt.isResultDependent) =>
+          Some(mt)
         case FunctionNOf(argTypes, resultType, isContextual) =>
           val methodType = if isContextual then ContextualMethodType else MethodType
           Some(methodType(argTypes, resultType))
@@ -1180,20 +1181,6 @@ class Definitions {
         case _ => isValidMethodType(info)
   }
 
-  object DependentFunctionRefinementOf {
-    /** Matches a dependent refinement of `FunctionN[...]` or `ContextFunctionN[...]` type.
-     *  Extracts the method type type and apply info.
-     *
-     *  Pattern: `(FunctionN | ContextFunction|) { def apply: $mt }`
-     */
-    def unapply(tpe: RefinedType)(using Context): Option[MethodType] =
-      tpe.refinedInfo match
-        case mt: MethodType
-        if tpe.refinedName == nme.apply && isFunctionNType(tpe.parent) && mt.isResultDependent =>
-          Some(mt)
-        case _ => None
-  }
-
   object PartialFunctionOf {
     def apply(arg: Type, result: Type)(using Context): Type =
       PartialFunctionClass.typeRef.appliedTo(arg :: result :: Nil)

compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

@@ -1800,7 +1800,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
             case _ => false
         def isDependentFunctionType: Boolean =
           self match
-            case dotc.core.Symbols.defn.DependentFunctionRefinementOf(_) => true
+            case dotc.core.Symbols.defn.FunctionOf(mt) => mt.isResultDependent
             case _ => false
         def isTupleN: Boolean =
           dotc.core.Symbols.defn.isTupleNType(self)