Skip to content

Commit 8af61b5

Browse files
authored
Move cc tests to captures subdirectories (#22331)
2 parents 0677702 + bbdf3cb commit 8af61b5

32 files changed

+18
-40
lines changed

tests/neg/cc-poly-1.check renamed to tests/neg-custom-args/captures/cc-poly-1.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
-- [E057] Type Mismatch Error: tests/neg/cc-poly-1.scala:12:6 ----------------------------------------------------------
1+
-- [E057] Type Mismatch Error: tests/neg-custom-args/captures/cc-poly-1.scala:12:6 -------------------------------------
22
12 | f[Any](D()) // error
33
| ^
44
| Type argument Any does not conform to upper bound caps.CapSet^
55
|
66
| longer explanation available when compiling with `-explain`
7-
-- [E057] Type Mismatch Error: tests/neg/cc-poly-1.scala:13:6 ----------------------------------------------------------
7+
-- [E057] Type Mismatch Error: tests/neg-custom-args/captures/cc-poly-1.scala:13:6 -------------------------------------
88
13 | f[String](D()) // error
99
| ^
1010
| Type argument String does not conform to upper bound caps.CapSet^

tests/neg/cc-poly-2.check renamed to tests/neg-custom-args/captures/cc-poly-2.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
-- [E007] Type Mismatch Error: tests/neg/cc-poly-2.scala:14:19 ---------------------------------------------------------
1+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/cc-poly-2.scala:14:19 ------------------------------------
22
14 | f[CapSet^{c1}](d) // error
33
| ^
44
| Found: (d : Test.D^)
55
| Required: Test.D^{c1}
66
|
77
| longer explanation available when compiling with `-explain`
8-
-- [E007] Type Mismatch Error: tests/neg/cc-poly-2.scala:16:20 ---------------------------------------------------------
8+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/cc-poly-2.scala:16:20 ------------------------------------
99
16 | val _: D^{c1} = x // error
1010
| ^
1111
| Found: (x : Test.D^{d})

tests/neg/existential-mapping.check renamed to tests/neg-custom-args/captures/existential-mapping.check

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
1-
-- Error: tests/neg/existential-mapping.scala:44:13 --------------------------------------------------------------------
1+
-- Error: tests/neg-custom-args/captures/existential-mapping.scala:44:13 -----------------------------------------------
22
44 | val z1: A^ => Array[C^] = ??? // error
33
| ^^^^^^^^^^^^^^^
44
| Array[box C^] captures the root capability `cap` in invariant position
5-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:9:25 ------------------------------------------------
5+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:9:25 ---------------------------
66
9 | val _: (x: C^) -> C = x1 // error
77
| ^^
88
| Found: (x1 : (x: C^) -> (ex$3: caps.Exists) -> C^{ex$3})
99
| Required: (x: C^) -> C
1010
|
1111
| longer explanation available when compiling with `-explain`
12-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:12:20 -----------------------------------------------
12+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:12:20 --------------------------
1313
12 | val _: C^ -> C = x2 // error
1414
| ^^
1515
| Found: (x2 : C^ -> (ex$7: caps.Exists) -> C^{ex$7})
1616
| Required: C^ -> C
1717
|
1818
| longer explanation available when compiling with `-explain`
19-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:15:30 -----------------------------------------------
19+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:15:30 --------------------------
2020
15 | val _: A^ -> (x: C^) -> C = x3 // error
2121
| ^^
2222
| Found: (x3 : A^ -> (x: C^) -> (ex$11: caps.Exists) -> C^{ex$11})
2323
| Required: A^ -> (x: C^) -> C
2424
|
2525
| longer explanation available when compiling with `-explain`
26-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:18:25 -----------------------------------------------
26+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:18:25 --------------------------
2727
18 | val _: A^ -> C^ -> C = x4 // error
2828
| ^^
2929
| Found: (x4 : A^ -> C^ -> (ex$19: caps.Exists) -> C^{ex$19})
3030
| Required: A^ -> C^ -> C
3131
|
3232
| longer explanation available when compiling with `-explain`
33-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:21:30 -----------------------------------------------
33+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:21:30 --------------------------
3434
21 | val _: A^ -> (x: C^) -> C = x5 // error
3535
| ^^
3636
| Found: (x5 : A^ -> (ex$27: caps.Exists) -> Fun[C^{ex$27}])
3737
| Required: A^ -> (x: C^) -> C
3838
|
3939
| longer explanation available when compiling with `-explain`
40-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:24:30 -----------------------------------------------
40+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:24:30 --------------------------
4141
24 | val _: A^ -> (x: C^) => C = x6 // error
4242
| ^^
4343
| Found: (x6 : A^ -> (ex$33: caps.Exists) -> IFun[C^{ex$33}])
4444
| Required: A^ -> (ex$36: caps.Exists) -> (x: C^) ->{ex$36} C
4545
|
4646
| longer explanation available when compiling with `-explain`
47-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:27:25 -----------------------------------------------
47+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:27:25 --------------------------
4848
27 | val _: (x: C^) => C = y1 // error
4949
| ^^
5050
| Found: (y1 : (x: C^) => (ex$38: caps.Exists) -> C^{ex$38})
5151
| Required: (x: C^) => C
5252
|
5353
| longer explanation available when compiling with `-explain`
54-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:30:20 -----------------------------------------------
54+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:30:20 --------------------------
5555
30 | val _: C^ => C = y2 // error
5656
| ^^
5757
| Found: (y2 : C^ => (ex$42: caps.Exists) -> C^{ex$42})
5858
| Required: C^ => C
5959
|
6060
| longer explanation available when compiling with `-explain`
61-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:33:30 -----------------------------------------------
61+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:33:30 --------------------------
6262
33 | val _: A^ => (x: C^) => C = y3 // error
6363
| ^^
6464
| Found: (y3 : A^ => (ex$47: caps.Exists) -> (x: C^) ->{ex$47} (ex$46: caps.Exists) -> C^{ex$46})
6565
| Required: A^ => (ex$50: caps.Exists) -> (x: C^) ->{ex$50} C
6666
|
6767
| longer explanation available when compiling with `-explain`
68-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:36:25 -----------------------------------------------
68+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:36:25 --------------------------
6969
36 | val _: A^ => C^ => C = y4 // error
7070
| ^^
7171
| Found: (y4 : A^ => (ex$53: caps.Exists) -> C^ ->{ex$53} (ex$52: caps.Exists) -> C^{ex$52})
7272
| Required: A^ => (ex$56: caps.Exists) -> C^ ->{ex$56} C
7373
|
7474
| longer explanation available when compiling with `-explain`
75-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:39:30 -----------------------------------------------
75+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:39:30 --------------------------
7676
39 | val _: A^ => (x: C^) -> C = y5 // error
7777
| ^^
7878
| Found: (y5 : A^ => (ex$58: caps.Exists) -> Fun[C^{ex$58}])
7979
| Required: A^ => (x: C^) -> C
8080
|
8181
| longer explanation available when compiling with `-explain`
82-
-- [E007] Type Mismatch Error: tests/neg/existential-mapping.scala:42:30 -----------------------------------------------
82+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/existential-mapping.scala:42:30 --------------------------
8383
42 | val _: A^ => (x: C^) => C = y6 // error
8484
| ^^
8585
| Found: (y6 : A^ => (ex$64: caps.Exists) -> IFun[C^{ex$64}])

tests/neg/i19470.check renamed to tests/neg-custom-args/captures/i19470.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- [E007] Type Mismatch Error: tests/neg/i19470.scala:9:12 -------------------------------------------------------------
1+
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i19470.scala:9:12 ----------------------------------------
22
9 | List(foo(f())) // error
33
| ^^^^^^^^
44
| Found: Inv[box IO^{f?}]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/pos/Buffer.scala

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)