remove markSolved

Author: Linyxus

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

@@ -630,7 +630,6 @@ class CheckCaptures extends Recheck, SymTransformer:
             if (ares1 eq ares) && (aargs1 eq aargs) then actual
             else reconstruct(aargs1, ares1)
 
-          curEnv.captured.asVar.markSolved()
           (resTp, curEnv.captured)
         finally
           curEnv = saved
@@ -656,7 +655,6 @@ class CheckCaptures extends Recheck, SymTransformer:
             if ares1 eq ares then actual
             else reconstruct(ares1)
 
-          curEnv.captured.asVar.markSolved()
           (resTp, curEnv.captured)
         finally
           curEnv = saved

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

@@ -633,6 +633,13 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
               case (info1: MethodType, info2: MethodType) =>
                 matchingMethodParams(info1, info2, precise = false)
                 && isSubInfo(info1.resultType, info2.resultType.subst(info2, info1))
+              case (info1 @ CapturingType(parent1, refs1), info2: Type) =>
+                subCaptures(refs1, info2.captureSet, frozenConstraint).isOK && sameBoxed(info1, info2, refs1)
+                  && isSubInfo(parent1, info2)
+              case (info1: Type, CapturingType(parent2, refs2)) =>
+                val refs1 = info1.captureSet
+                (refs1.isAlwaysEmpty || subCaptures(refs1, refs2, frozenConstraint).isOK) && sameBoxed(info1, info2, refs1)
+                  && isSubInfo(info1, parent2)
               case _ =>
                 isSubType(info1, info2)
 

tests/neg-custom-args/captures/curried-simplified.check

@@ -15,28 +15,28 @@
 -- [E007] Type Mismatch Error: tests/neg-custom-args/captures/curried-simplified.scala:11:39 ---------------------------
 11 |  def y3: Cap -> Protect[Int -> Int] = x3 // error
    |                                       ^^
-   |                                       Found:    (x$0: Cap) -> {x$0} Int -> Int
+   |                                       Found:    ? (x$0: Cap) -> {x$0} Int -> Int
    |                                       Required: Cap -> Protect[Int -> Int]
    |
    | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg-custom-args/captures/curried-simplified.scala:15:33 ---------------------------
 15 |  def y5: Cap -> {} Int -> Int = x5 // error
    |                                 ^^
-   |                                 Found:    Cap -> {x} Int -> Int
+   |                                 Found:    ? Cap -> {x} Int -> Int
    |                                 Required: Cap -> {} Int -> Int
    |
    | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg-custom-args/captures/curried-simplified.scala:17:49 ---------------------------
 17 |  def y6: Cap -> {} Cap -> Protect[Int -> Int] = x6 // error
    |                                                 ^^
-   |                                               Found:    (x$0: Cap) -> {x$0} (x$0: Cap) -> {x$0, x$0} Int -> Int
-   |                                               Required: Cap -> {} Cap -> Protect[Int -> Int]
+   |                                             Found:    ? (x$0: Cap) -> {x$0} (x$0: Cap) -> {x$0, x$0} Int -> Int
+   |                                             Required: Cap -> {} Cap -> Protect[Int -> Int]
    |
    | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg-custom-args/captures/curried-simplified.scala:19:49 ---------------------------
 19 |  def y7: Cap -> Protect[Cap -> {} Int -> Int] = x7 // error
    |                                                 ^^
-   |                                                 Found:    (x$0: Cap) -> {x$0} (x: Cap) -> {x$0, x} Int -> Int
+   |                                                 Found:    ? (x$0: Cap) -> {x$0} (x: Cap) -> {x$0, x} Int -> Int
    |                                                 Required: Cap -> Protect[Cap -> {} Int -> Int]
    |
    | longer explanation available when compiling with `-explain`

tests/neg-custom-args/captures/eta.check

@@ -1,7 +1,7 @@
 -- [E007] Type Mismatch Error: tests/neg-custom-args/captures/eta.scala:4:9 --------------------------------------------
 4 |         g  // error
   |         ^
-  |         Found:    (g : () -> A)
+  |         Found:    ? () -> A
   |         Required: () -> {f} Proc
   |
   | longer explanation available when compiling with `-explain`

tests/neg-custom-args/captures/usingLogFile.check

@@ -1,7 +1,7 @@
 -- Error: tests/neg-custom-args/captures/usingLogFile.scala:23:27 ------------------------------------------------------
 23 |  val later = usingLogFile { f => () => f.write(0) } // error
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^
-   |                           {f, *} () -> Unit cannot be box-converted to box ? () -> Unit
+   |                           {f} () -> Unit cannot be box-converted to box ? () -> Unit
    |                           since one of their capture sets contains the root capability `*`
 -- Error: tests/neg-custom-args/captures/usingLogFile.scala:29:9 -------------------------------------------------------
 29 |  later2.x()  // error
@@ -21,15 +21,15 @@
 -- Error: tests/neg-custom-args/captures/usingLogFile.scala:47:27 ------------------------------------------------------
 47 |  val later = usingLogFile { f => () => f.write(0) } // error
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^
-   |                           {f, *} () -> Unit cannot be box-converted to box ? () -> Unit
+   |                           {f} () -> Unit cannot be box-converted to box ? () -> Unit
    |                           since one of their capture sets contains the root capability `*`
 -- Error: tests/neg-custom-args/captures/usingLogFile.scala:62:33 ------------------------------------------------------
 62 |    val later = usingFile("out", f => (y: Int) => xs.foreach(x => f.write(x + y))) // error
    |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |                                 {f, *} (x$0: Int) -> Unit cannot be box-converted to box ? (x$0: Int) -> Unit
+   |                                 {f} (x$0: Int) -> Unit cannot be box-converted to box ? (x$0: Int) -> Unit
    |                                 since one of their capture sets contains the root capability `*`
 -- Error: tests/neg-custom-args/captures/usingLogFile.scala:71:37 ------------------------------------------------------
 71 |    val later = usingFile("logfile", usingLogger(_, l => () => l.log("test"))) // error
    |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |                                     {_$1, *} () -> Unit cannot be box-converted to box ? () -> Unit
+   |                                     {_$1} () -> Unit cannot be box-converted to box ? () -> Unit
    |                                     since one of their capture sets contains the root capability `*`