Move CaptureSet to cc

Author: odersky

compiler/src/dotty/tools/dotc/core/CaptureSet.scala renamed to compiler/src/dotty/tools/dotc/cc/CaptureSet.scala

@@ -1,7 +1,8 @@
 package dotty.tools
 package dotc
-package core
+package cc
 
+import core.*
 import Types.*, Symbols.*, Flags.*, Contexts.*, Decorators.*
 import config.Printers.capt
 import Annotations.Annotation
@@ -12,7 +13,6 @@ import printing.{Showable, Printer}
 import printing.Texts.*
 import util.SimpleIdentitySet
 import util.common.alwaysTrue
-import cc.*
 
 /** A class for capture sets. Capture sets can be constants or variables.
  *  Capture sets support inclusion constraints <:< where <:< is subcapturing.
@@ -179,7 +179,7 @@ object CaptureSet:
     defn.captureRoot.termRef.singletonCaptureSet
 
   /** Used as a recursion brake */
-  @sharable private[core] val Pending = Const(SimpleIdentitySet.empty)
+  @sharable private[dotc] val Pending = Const(SimpleIdentitySet.empty)
 
   def apply(elems: CaptureRef*)(using Context): CaptureSet.Const =
     if elems.isEmpty then empty

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

@@ -14,7 +14,7 @@ import typer.ImportInfo.RootRef
 import Comments.CommentsContext
 import Comments.Comment
 import util.Spans.NoSpan
-import cc.CapturingType
+import cc.{CapturingType, CaptureSet}
 
 import scala.annotation.tailrec
 

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

@@ -23,9 +23,8 @@ import typer.ProtoTypes.constrained
 import typer.Applications.productSelectorTypes
 import reporting.trace
 import NullOpsDecorator._
-import CaptureSet.CompareResult as CaptCompareResult
 import annotation.constructorOnly
-import cc.{CapturingType, derivedCapturingType}
+import cc.{CapturingType, derivedCapturingType, CaptureSet}
 
 /** Provides methods to compare types.
  */
@@ -492,7 +491,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
             // under -Ycheck. Test case is i7965.scala.
 
       case CapturingType(parent1, refs1) =>
-        if refs1 <:< tp2.captureSet == CaptCompareResult.OK then recur(parent1, tp2)
+        if refs1 <:< tp2.captureSet == CaptureSet.CompareResult.OK then recur(parent1, tp2)
         else thirdTry
       case tp1: AnnotatedType if !tp1.isRefining =>
         recur(tp1.parent, tp2)
@@ -2383,7 +2382,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
     case tp1: TypeVar if tp1.isInstantiated =>
       tp1.underlying & tp2
     case CapturingType(parent1, refs1) =>
-      if tp2.captureSet <:< refs1 == CaptCompareResult.OK then parent1 & tp2
+      if tp2.captureSet <:< refs1 == CaptureSet.CompareResult.OK then parent1 & tp2
       else tp1.derivedCapturingType(parent1 & tp2, refs1)
     case tp1: AnnotatedType if !tp1.isRefining =>
       tp1.underlying & tp2

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

@@ -19,8 +19,8 @@ import typer.ForceDegree
 import typer.Inferencing._
 import typer.IfBottom
 import reporting.TestingReporter
+import cc.{CapturingType, derivedCapturingType, CaptureSet}
 import CaptureSet.CompareResult
-import cc.{CapturingType, derivedCapturingType}
 
 import scala.annotation.internal.sharable
 import scala.annotation.threadUnsafe

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

@@ -38,7 +38,7 @@ import scala.util.hashing.{ MurmurHash3 => hashing }
 import config.Printers.{core, typr, matchTypes}
 import reporting.{trace, Message}
 import java.lang.ref.WeakReference
-import cc.{CapturingType, derivedCapturingType, retainedElems}
+import cc.{CapturingType, CaptureSet, derivedCapturingType, retainedElems}
 import CaptureSet.CompareResult
 
 import scala.annotation.internal.sharable

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

@@ -15,6 +15,7 @@ import ProtoTypes._
 import collection.mutable
 import reporting._
 import Checking.{checkNoPrivateLeaks, checkNoWildcard}
+import cc.CaptureSet
 
 trait TypeAssigner {
   import tpd.*