Move cc tests to captures subdirectories

scala · Jan 9, 2025 · bbdf3cb · bbdf3cb
1 parent 0677702
commit bbdf3cb
Show file tree

Hide file tree

Showing 32 changed files with 18 additions and 40 deletions.
diff --git a/tests/neg/capt-wf.scala → tests/neg-custom-args/captures/capt-wf.scala b/tests/neg/capt-wf.scala → tests/neg-custom-args/captures/capt-wf.scala
diff --git a/tests/neg/cc-ex-conformance.scala → ...tom-args/captures/cc-ex-conformance.scala b/tests/neg/cc-ex-conformance.scala → ...tom-args/captures/cc-ex-conformance.scala
diff --git a/tests/neg/cc-poly-1.check → .../neg-custom-args/captures/cc-poly-1.check b/tests/neg/cc-poly-1.check → .../neg-custom-args/captures/cc-poly-1.check
@@ -1,10 +1,10 @@
--- [E057] Type Mismatch Error: tests/neg/cc-poly-1.scala:12:6 ----------------------------------------------------------
+-- [E057] Type Mismatch Error: tests/neg-custom-args/captures/cc-poly-1.scala:12:6 -------------------------------------
 12 |    f[Any](D()) // error
    |      ^
    |      Type argument Any does not conform to upper bound caps.CapSet^
    |
    | longer explanation available when compiling with `-explain`
--- [E057] Type Mismatch Error: tests/neg/cc-poly-1.scala:13:6 ----------------------------------------------------------
+-- [E057] Type Mismatch Error: tests/neg-custom-args/captures/cc-poly-1.scala:13:6 -------------------------------------
 13 |    f[String](D()) // error
    |      ^
    |      Type argument String does not conform to upper bound caps.CapSet^

diff --git a/tests/neg/cc-poly-1.scala → .../neg-custom-args/captures/cc-poly-1.scala b/tests/neg/cc-poly-1.scala → .../neg-custom-args/captures/cc-poly-1.scala
diff --git a/tests/neg/cc-poly-2.check → .../neg-custom-args/captures/cc-poly-2.check b/tests/neg/cc-poly-2.check → .../neg-custom-args/captures/cc-poly-2.check
@@ -1,11 +1,11 @@
--- [E007] Type Mismatch Error: tests/neg/cc-poly-2.scala:14:19 ---------------------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/cc-poly-2.scala:14:19 ------------------------------------
 14 |    f[CapSet^{c1}](d) // error
    |                   ^
    |                   Found:    (d : Test.D^)
    |                   Required: Test.D^{c1}
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/cc-poly-2.scala:16:20 ---------------------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/cc-poly-2.scala:16:20 ------------------------------------
 16 |    val _: D^{c1} = x // error
    |                    ^
    |                    Found:    (x : Test.D^{d})

diff --git a/tests/neg/cc-poly-2.scala → .../neg-custom-args/captures/cc-poly-2.scala b/tests/neg/cc-poly-2.scala → .../neg-custom-args/captures/cc-poly-2.scala
diff --git a/tests/neg/existential-mapping.check → ...m-args/captures/existential-mapping.check b/tests/neg/existential-mapping.check → ...m-args/captures/existential-mapping.check
@@ -1,85 +1,85 @@
--- Error: tests/neg/existential-mapping.scala:44:13 --------------------------------------------------------------------
+-- Error: tests/neg-custom-args/captures/existential-mapping.scala:44:13 -----------------------------------------------
 44 |  val z1: A^ => Array[C^] = ??? // error
    |          ^^^^^^^^^^^^^^^
    |          Array[box C^] captures the root capability `cap` in invariant position
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:9:25 ------------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:9:25 ---------------------------
 9 |  val _:  (x: C^) -> C = x1 // error
   |                         ^^
   |                         Found:    (x1 : (x: C^) -> (ex$3: caps.Exists) -> C^{ex$3})
   |                         Required: (x: C^) -> C
   |
   | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:12:20 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:12:20 --------------------------
 12 |  val _:  C^ -> C = x2 // error
    |                    ^^
    |                    Found:    (x2 : C^ -> (ex$7: caps.Exists) -> C^{ex$7})
    |                    Required: C^ -> C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:15:30 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:15:30 --------------------------
 15 |  val _: A^ -> (x: C^) -> C = x3 // error
    |                              ^^
    |                              Found:    (x3 : A^ -> (x: C^) -> (ex$11: caps.Exists) -> C^{ex$11})
    |                              Required: A^ -> (x: C^) -> C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:18:25 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:18:25 --------------------------
 18 |  val _: A^ -> C^ -> C = x4 // error
    |                         ^^
    |                         Found:    (x4 : A^ -> C^ -> (ex$19: caps.Exists) -> C^{ex$19})
    |                         Required: A^ -> C^ -> C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:21:30 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:21:30 --------------------------
 21 |  val _: A^ -> (x: C^) -> C = x5 // error
    |                              ^^
    |                              Found:    (x5 : A^ -> (ex$27: caps.Exists) -> Fun[C^{ex$27}])
    |                              Required: A^ -> (x: C^) -> C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:24:30 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:24:30 --------------------------
 24 |  val _: A^ -> (x: C^) => C = x6 // error
    |                              ^^
    |                              Found:    (x6 : A^ -> (ex$33: caps.Exists) -> IFun[C^{ex$33}])
    |                              Required: A^ -> (ex$36: caps.Exists) -> (x: C^) ->{ex$36} C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:27:25 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:27:25 --------------------------
 27 |  val _:  (x: C^) => C = y1 // error
    |                         ^^
    |                         Found:    (y1 : (x: C^) => (ex$38: caps.Exists) -> C^{ex$38})
    |                         Required: (x: C^) => C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:30:20 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:30:20 --------------------------
 30 |  val _:  C^ => C = y2 // error
    |                    ^^
    |                    Found:    (y2 : C^ => (ex$42: caps.Exists) -> C^{ex$42})
    |                    Required: C^ => C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:33:30 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:33:30 --------------------------
 33 |  val _: A^ => (x: C^) => C = y3 // error
    |                              ^^
    |              Found:    (y3 : A^ => (ex$47: caps.Exists) -> (x: C^) ->{ex$47} (ex$46: caps.Exists) -> C^{ex$46})
    |              Required: A^ => (ex$50: caps.Exists) -> (x: C^) ->{ex$50} C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:36:25 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:36:25 --------------------------
 36 |  val _: A^ => C^ => C = y4 // error
    |                         ^^
    |                   Found:    (y4 : A^ => (ex$53: caps.Exists) -> C^ ->{ex$53} (ex$52: caps.Exists) -> C^{ex$52})
    |                   Required: A^ => (ex$56: caps.Exists) -> C^ ->{ex$56} C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:39:30 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:39:30 --------------------------
 39 |  val _: A^ => (x: C^) -> C = y5 // error
    |                              ^^
    |                              Found:    (y5 : A^ => (ex$58: caps.Exists) -> Fun[C^{ex$58}])
    |                              Required: A^ => (x: C^) -> C
    |
    | longer explanation available when compiling with `-explain`
--- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:42:30 -----------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:42:30 --------------------------
 42 |  val _: A^ => (x: C^) => C = y6 // error
    |                              ^^
    |                              Found:    (y6 : A^ => (ex$64: caps.Exists) -> IFun[C^{ex$64}])

diff --git a/tests/neg/existential-mapping.scala → ...m-args/captures/existential-mapping.scala b/tests/neg/existential-mapping.scala → ...m-args/captures/existential-mapping.scala
diff --git a/tests/neg/i19470.check → tests/neg-custom-args/captures/i19470.check b/tests/neg/i19470.check → tests/neg-custom-args/captures/i19470.check
@@ -1,4 +1,4 @@
--- [E007] Type Mismatch Error: tests/neg/i19470.scala:9:12 -------------------------------------------------------------
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i19470.scala:9:12 ----------------------------------------
 9 |    List(foo(f())) // error
   |         ^^^^^^^^
   |         Found:    Inv[box IO^{f?}]

diff --git a/tests/neg/i19470.scala → tests/neg-custom-args/captures/i19470.scala b/tests/neg/i19470.scala → tests/neg-custom-args/captures/i19470.scala
diff --git a/tests/neg/i20503.scala → tests/neg-custom-args/captures/i20503.scala b/tests/neg/i20503.scala → tests/neg-custom-args/captures/i20503.scala
diff --git a/tests/neg/language-imports.scala → ...stom-args/captures/language-imports.scala b/tests/neg/language-imports.scala → ...stom-args/captures/language-imports.scala
diff --git a/tests/neg/leak-problem-unboxed.scala → ...-args/captures/leak-problem-unboxed.scala b/tests/neg/leak-problem-unboxed.scala → ...-args/captures/leak-problem-unboxed.scala
diff --git a/tests/neg/leak-problem.scala → ...g-custom-args/captures/leak-problem.scala b/tests/neg/leak-problem.scala → ...g-custom-args/captures/leak-problem.scala
diff --git a/tests/pos/annot-i20272a.scala → ...-custom-args/captures/annot-i20272a.scala b/tests/pos/annot-i20272a.scala → ...-custom-args/captures/annot-i20272a.scala
diff --git a/tests/pos/byname-purefuns-adapt/A_1.scala → .../captures/byname-purefuns-adapt/A_1.scala b/tests/pos/byname-purefuns-adapt/A_1.scala → .../captures/byname-purefuns-adapt/A_1.scala
diff --git a/tests/pos/byname-purefuns-adapt/B_2.scala → .../captures/byname-purefuns-adapt/B_2.scala b/tests/pos/byname-purefuns-adapt/B_2.scala → .../captures/byname-purefuns-adapt/B_2.scala
diff --git a/tests/pos/cc-experimental.scala → ...ustom-args/captures/cc-experimental.scala b/tests/pos/cc-experimental.scala → ...ustom-args/captures/cc-experimental.scala
diff --git a/tests/pos/cc-poly-1.scala → .../pos-custom-args/captures/cc-poly-1.scala b/tests/pos/cc-poly-1.scala → .../pos-custom-args/captures/cc-poly-1.scala
diff --git a/tests/pos/cc-poly-source-capability.scala → .../captures/cc-poly-source-capability.scala b/tests/pos/cc-poly-source-capability.scala → .../captures/cc-poly-source-capability.scala
diff --git a/tests/pos/cc-poly-source.scala → ...custom-args/captures/cc-poly-source.scala b/tests/pos/cc-poly-source.scala → ...custom-args/captures/cc-poly-source.scala
diff --git a/tests/pos/dotty-experimental.scala → ...om-args/captures/dotty-experimental.scala b/tests/pos/dotty-experimental.scala → ...om-args/captures/dotty-experimental.scala
diff --git a/tests/pos/i18699.scala → tests/pos-custom-args/captures/i18699.scala b/tests/pos/i18699.scala → tests/pos-custom-args/captures/i18699.scala
diff --git a/tests/pos/i18909.scala → tests/pos-custom-args/captures/i18909.scala b/tests/pos/i18909.scala → tests/pos-custom-args/captures/i18909.scala
diff --git a/tests/pos/i20135.scala → tests/pos-custom-args/captures/i20135.scala b/tests/pos/i20135.scala → tests/pos-custom-args/captures/i20135.scala
diff --git a/tests/pos/i21390.TrieMap.scala → ...custom-args/captures/i21390.TrieMap.scala b/tests/pos/i21390.TrieMap.scala → ...custom-args/captures/i21390.TrieMap.scala
diff --git a/tests/pos/infer-exists.scala → ...s-custom-args/captures/infer-exists.scala b/tests/pos/infer-exists.scala → ...s-custom-args/captures/infer-exists.scala
diff --git a/tests/pos/invariant-cc.scala → ...s-custom-args/captures/invariant-cc.scala b/tests/pos/invariant-cc.scala → ...s-custom-args/captures/invariant-cc.scala
diff --git a/tests/pos/polycap.scala → tests/pos-custom-args/captures/polycap.scala b/tests/pos/polycap.scala → tests/pos-custom-args/captures/polycap.scala
diff --git a/tests/pos/reach-capability.scala → ...stom-args/captures/reach-capability.scala b/tests/pos/reach-capability.scala → ...stom-args/captures/reach-capability.scala
diff --git a/tests/pos/reach-problem.scala → ...-custom-args/captures/reach-problem.scala b/tests/pos/reach-problem.scala → ...-custom-args/captures/reach-problem.scala
diff --git a/tests/pos/Buffer.scala b/tests/pos/Buffer.scala