Switch TypeApplications from export to given

Author: som-snytt

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

@@ -13,7 +13,7 @@ import StdNames.nme
 import Flags.{Module, Provisional}
 import dotty.tools.dotc.config.Config
 
-object TypeApplications {
+object TypeApplications:
 
   type TypeParamInfo = ParamInfo.Of[TypeName]
 
@@ -148,8 +148,12 @@ object TypeApplications {
     }
   }
 
-  // Extensions that model type application.
-  extension (self: Type) {
+/** Extensions that model type application.
+ */
+trait TypeApplications:
+  import TypeApplications.*
+
+  extension (self: Type) { // braces to avoid indent
   /** The type parameters of this type are:
    *  For a ClassInfo type, the type parameters of its class.
    *  For a typeref referring to a class, the type parameters of the class.
@@ -584,4 +588,3 @@ object TypeApplications {
     assert(!self.isInstanceOf[TypeBounds], "no TypeBounds allowed")
     self
   }
-}

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

@@ -2132,6 +2132,9 @@ object Types extends TypeUtils {
     /** Is the `hash` of this type the same for all possible sequences of enclosing binders? */
     def hashIsStable: Boolean = true
   }
+  object Type:
+    // Extensions that model type application.
+    given TypeApplications()
 
   // end Type
 
@@ -4372,10 +4375,10 @@ object Types extends TypeUtils {
         setVariances(tparams.tail, vs.tail)
 
     override val isDeclaredVarianceLambda = variances.nonEmpty
-    if isDeclaredVarianceLambda then setVariances(this.typeParams, variances)
+    if isDeclaredVarianceLambda then setVariances(typeParams, variances)
 
     def declaredVariances =
-      if isDeclaredVarianceLambda then this.typeParams.map(_.declaredVariance)
+      if isDeclaredVarianceLambda then typeParams.map(_.declaredVariance)
       else Nil
 
     override def computeHash(bs: Binders): Int =
@@ -4388,7 +4391,7 @@ object Types extends TypeUtils {
         paramNames.eqElements(that.paramNames)
         && isDeclaredVarianceLambda == that.isDeclaredVarianceLambda
         && (!isDeclaredVarianceLambda
-            || this.typeParams.corresponds(that.typeParams)((x, y) =>
+            || typeParams.corresponds(that.typeParams)((x, y) =>
                   x.declaredVariance == y.declaredVariance))
         && {
           val bs1 = new SomeBinderPairs(this, that, bs)
@@ -7162,8 +7165,6 @@ object Types extends TypeUtils {
 
   // ----- Helpers and Decorator implicits --------------------------------------
 
-  export TypeApplications.{EtaExpandIfHK as _, EtaExpansion as _, TypeParamInfo as _, *}
-
   extension (tps1: List[Type]) {
     @tailrec def hashIsStable: Boolean =
       tps1.isEmpty || tps1.head.hashIsStable && tps1.tail.hashIsStable

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

@@ -1897,9 +1897,9 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
           dotc.core.Symbols.defn.isTupleNType(self)
         def select(sym: Symbol): TypeRepr = self.select(sym)
         def appliedTo(targ: TypeRepr): TypeRepr =
-          dotc.core.Types.appliedTo(self)(targ)
+          Types.Type.given_TypeApplications.appliedTo(self)(targ)
         def appliedTo(targs: List[TypeRepr]): TypeRepr =
-          dotc.core.Types.appliedTo(self)(targs)
+          Types.Type.given_TypeApplications.appliedTo(self)(targs)
         def substituteTypes(from: List[Symbol], to: List[TypeRepr]): TypeRepr =
           self.subst(from, to)