Skip to content

Commit ada6847

Browse files
nicolasstuckinicolasstucki
committed
Move neg erased tests to neg-custom-args/erased
1 parent 7feb567 commit ada6847

File tree

11 files changed

+70
-56
lines changed

11 files changed

+70
-56
lines changed

‎tests/neg/i2642.scala renamed to ‎tests/neg-custom-args/erased/i2642.scala

File renamed without changes.

‎tests/neg-custom-args/erased/i4058.scala

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sealed erased class E // error

‎tests/neg-custom-args/erased/i5525.scala

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
erased enum Foo6 {} // error: only access modifiers allowed
3+
4+
enum Foo10 {
5+
erased case C6() // error: only access modifiers allowed
6+
}
7+
8+
enum Foo11 {
9+
erased case C6 // error: only access modifiers allowed
10+
}

‎tests/neg/i6795.check renamed to ‎tests/neg-custom-args/erased/i6795.check

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- Error: tests/neg/i6795.scala:1:13 -----------------------------------------------------------------------------------
1+
-- Error: tests/neg-custom-args/erased/i6795.scala:1:13 ----------------------------------------------------------------
22
1 |erased class Foo // error
33
|^^^^^^^^^^^^^^^^
44
|modifier(s) `erased` incompatible with type definition

‎tests/neg/i6795.scala renamed to ‎tests/neg-custom-args/erased/i6795.scala

File renamed without changes.

‎tests/neg-custom-args/erased/tupled-function-instances.scala

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
object Test {
2+
def main(args: Array[String]): Unit = {
3+
type T
4+
type R
5+
6+
summon[TupledFunction[(erased T) => R, erased Tuple1[T] => R]] // error
7+
summon[TupledFunction[erased (T, T) => R,(erased (T, T)) => R]] // error
8+
summon[TupledFunction[erased (T, T, T) => R,(erased (T, T, T)) => R]] // error
9+
summon[TupledFunction[erased (T, T, T, T) => R,(erased (T, T, T, T)) => R]] // error
10+
summon[TupledFunction[erased (T, T, T, T, T) => R,(erased (T, T, T, T, T)) => R]] // error
11+
summon[TupledFunction[erased (T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T)) => R]] // error
12+
summon[TupledFunction[erased (T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T)) => R]] // error
13+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T)) => R]] // error
14+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T)) => R]] // error
15+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T)) => R]] // error
16+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
17+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
18+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
19+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
20+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
21+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
22+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
23+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
24+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
25+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
26+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
27+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
28+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
29+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
30+
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
31+
32+
summon[TupledFunction[(given erased T) => R, (given erased Tuple1[T]) => R]] // error
33+
summon[TupledFunction[(given erased T, T) => R, (given erased T, T) => R]] // error
34+
summon[TupledFunction[(given erased T, T, T) => R, (given erased T, T, T) => R]] // error
35+
summon[TupledFunction[(given erased T, T, T, T) => R, (given erased T, T, T, T) => R]] // error
36+
summon[TupledFunction[(given erased T, T, T, T, T) => R, (given erased T, T, T, T, T) => R]] // error
37+
summon[TupledFunction[(given erased T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T) => R]] // error
38+
summon[TupledFunction[(given erased T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T) => R]] // error
39+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T) => R]] // error
40+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T) => R]] // error
41+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T) => R]] // error
42+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T) => R]] // error
43+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
44+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
45+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
46+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
47+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
48+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
49+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
50+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
51+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
52+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
53+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
54+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
55+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
56+
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
57+
}
58+
}

‎tests/neg/i4058.scala

-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ class D {
99
def g(override a: Int) = 0 // error
1010
def g(abstract a: Int) = 0 // error
1111
}
12-
sealed erased class E // error

‎tests/neg/i5525.scala

-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ final enum Foo2 {} // error: only access modifiers allowed
33
sealed enum Foo3 {} // error: only access modifiers allowed
44
implicit enum Foo4 {} // error: only access modifiers allowed
55
lazy enum Foo5 {} // error: only access modifiers allowed
6-
erased enum Foo6 {} // error: only access modifiers allowed
76
override enum Foo7 {} // error: only access modifiers allowed
87
inline enum Foo8 {} // error: only access modifiers allowed
98
opaque enum Foo9 {} // error: only access modifiers allowed
@@ -14,7 +13,6 @@ enum Foo10 {
1413
sealed case C3() // error: only access modifiers allowed
1514
implicit case C4() // error: only access modifiers allowed
1615
lazy case C5() // error: only access modifiers allowed
17-
erased case C6() // error: only access modifiers allowed
1816
override case C7() // error: only access modifiers allowed
1917
private case C8() // ok
2018
protected case C9() // ok
@@ -26,7 +24,6 @@ enum Foo11 {
2624
sealed case C3 // error: only access modifiers allowed
2725
implicit case C4 // error: only access modifiers allowed
2826
lazy case C5 // error: only access modifiers allowed
29-
erased case C6 // error: only access modifiers allowed
3027
override case C7 // error: only access modifiers allowed
3128
private case C8 // ok
3229
protected case C9 // ok

‎tests/neg/tupled-function-instances.scala

-51
Original file line numberDiff line numberDiff line change
@@ -19,56 +19,5 @@ object Test {
1919
summon[TupledFunction[(T, T, T) => R, (given (T, T, T)) =>R]] // error
2020
summon[TupledFunction[(given T, T, T) => R, ((T, T, T)) =>R]] // error
2121

22-
summon[TupledFunction[(erased T) => R, erased Tuple1[T] => R]] // error
23-
summon[TupledFunction[erased (T, T) => R,(erased (T, T)) => R]] // error
24-
summon[TupledFunction[erased (T, T, T) => R,(erased (T, T, T)) => R]] // error
25-
summon[TupledFunction[erased (T, T, T, T) => R,(erased (T, T, T, T)) => R]] // error
26-
summon[TupledFunction[erased (T, T, T, T, T) => R,(erased (T, T, T, T, T)) => R]] // error
27-
summon[TupledFunction[erased (T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T)) => R]] // error
28-
summon[TupledFunction[erased (T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T)) => R]] // error
29-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T)) => R]] // error
30-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T)) => R]] // error
31-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T)) => R]] // error
32-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
33-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
34-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
35-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
36-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
37-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
38-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
39-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
40-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
41-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
42-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
43-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
44-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
45-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
46-
summon[TupledFunction[erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R,(erased (T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T)) => R]] // error
47-
48-
summon[TupledFunction[(given erased T) => R, (given erased Tuple1[T]) => R]] // error
49-
summon[TupledFunction[(given erased T, T) => R, (given erased T, T) => R]] // error
50-
summon[TupledFunction[(given erased T, T, T) => R, (given erased T, T, T) => R]] // error
51-
summon[TupledFunction[(given erased T, T, T, T) => R, (given erased T, T, T, T) => R]] // error
52-
summon[TupledFunction[(given erased T, T, T, T, T) => R, (given erased T, T, T, T, T) => R]] // error
53-
summon[TupledFunction[(given erased T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T) => R]] // error
54-
summon[TupledFunction[(given erased T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T) => R]] // error
55-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T) => R]] // error
56-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T) => R]] // error
57-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T) => R]] // error
58-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T) => R]] // error
59-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
60-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
61-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
62-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
63-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
64-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
65-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
66-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
67-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
68-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
69-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
70-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
71-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
72-
summon[TupledFunction[(given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R, (given erased T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T) => R]] // error
7322
}
7423
}

‎tests/run-macros/reflect-isFunctionType/macro_1.scala renamed to ‎tests/run-custom-args/run-macros-erased/reflect-isFunctionType/macro_1.scala

File renamed without changes.

‎tests/run-macros/reflect-isFunctionType/test_2.scala renamed to ‎tests/run-custom-args/run-macros-erased/reflect-isFunctionType/test_2.scala

File renamed without changes.

0 commit comments

Comments
 (0)