Skip to content

Commit 276d02b

Browse files
Re-enable lost tests (#19903)
Found in #7906 (comment)
2 parents 162b543 + 442170c commit 276d02b

14 files changed

+34
-8
lines changed

tests/pos-custom-args/i4125.scala renamed to tests/pos/i4125.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
object Test {
24
def foo: ((erased x: Int, y: Int) => Int) = (erased x, y) => 1
35
def bar: ((erased x: Int, y: Int) ?=> Int) = (erased x, y) ?=> 1

tests/pos-custom-args/i4509.scala renamed to tests/pos/i4509.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
object Main {
24
def fun[T](op: (erased Int) ?=> T) = op(using 0)
35
fun { }

tests/pos-custom-args/i5938.scala renamed to tests/pos/i5938.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
import compiletime.summonFrom
4+
import compiletime.erasedValue
25

36
trait Link[T, A]
47

5-
inline def link[T] =
8+
transparent inline def link[T] =
69
summonFrom {
710
case _: Link[T, s] =>
811
summonFrom {
@@ -12,7 +15,7 @@ inline def link[T] =
1215

1316
class Foo
1417
object Foo {
15-
erased implicit val barLink: Link[Foo, Bar.type] = null
18+
erased implicit val barLink: Link[Foo, Bar.type] = erasedValue
1619
}
1720

1821
implicit object Bar {

tests/pos-custom-args/i6009a.scala renamed to tests/pos/i6009a.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
class Foo {
24
def foo(f: (erased Int) => Int): Int = {
35
erased val ctx = 1

tests/pos-custom-args/i6009b.scala renamed to tests/pos/i6009b.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
class Foo {
24
def foo(f: (erased Int) => Int): Int = {
35
erased val ctx = 1

tests/pos-custom-args/i6009c.scala renamed to tests/pos/i6009c.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
class Foo {
24
def foo(f: (erased Int) ?=> Int): Int = {
35
implicit erased val ctx = 1

tests/pos-custom-args/i6419.scala renamed to tests/pos/i6419.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
class Foo {
24
inline def foo: Unit = {
35
@scala.annotation.compileTimeOnly("some message") val res = ???

tests/pos-custom-args/i7741.scala renamed to tests/pos/i7741.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
class A1 {
24
@native private def a: Unit
35
}

tests/pos-custom-args/inline-match-gadt.scala renamed to tests/pos/inline-match-gadt.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
object `inline-match-gadt` {
24
class Exactly[T]
35
erased def exactType[T]: Exactly[T] = compiletime.erasedValue

tests/pos-custom-args/matchtype.scala renamed to tests/pos/matchtype.scala

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
import compiletime.*
1+
import scala.language.experimental.erasedDefinitions
2+
import compiletime.erasedValue
3+
import compiletime.ops.int.S
24
object Test {
35
type T[X] = X match {
46
case String => Int
57
case Int => String
68
}
79

810
type Len[X] <: Int = X match {
9-
case Unit => 0
11+
case EmptyTuple => 0
1012
case x *: xs => S[Len[xs]]
1113
}
1214

@@ -28,7 +30,7 @@ object Test {
2830
erased val z1: Head[(Int, String)] = 22
2931

3032
type Concat[X <: Tuple, Y <: Tuple] <: Tuple = X match {
31-
case Unit => Y
33+
case EmptyTuple => Y
3234
case x1 *: xs1 => x1 *: Concat[xs1, Y]
3335
}
3436

@@ -55,8 +57,8 @@ object Test {
5557
erased val y4: Elem[(String, Int, Boolean), 2] = erasedValue[Boolean]
5658
erased val z4: Boolean = erasedValue[Elem[(String, Int, Boolean), 2]]
5759

58-
erased val y5: Concat[Unit, (String, Int)] = erasedValue[(String, Int)]
59-
erased val z5: (String, Int) = erasedValue[Concat[Unit, (String, Int)]]
60+
erased val y5: Concat[EmptyTuple, (String, Int)] = erasedValue[(String, Int)]
61+
erased val z5: (String, Int) = erasedValue[Concat[EmptyTuple, (String, Int)]]
6062
erased val y6: Concat[(Boolean, Boolean), (String, Int)] = erasedValue[Boolean *: Boolean *: (String, Int)]
6163
erased val z6: Boolean *: Boolean *: (String, Int) = erasedValue[Concat[(Boolean, Boolean), (String, Int)]]
6264
erased val y7: (Boolean, Boolean, String, Int) = erasedValue[Concat[(Boolean, Boolean), String *: Int *: EmptyTuple]]

tests/pos-custom-args/phantom-Eq.scala renamed to tests/pos/phantom-Eq.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
object PhantomEq {
24
import EqUtil.*
35

tests/pos-custom-args/phantom-Eq2/Phantom-Eq_1.scala renamed to tests/pos/phantom-Eq2/Phantom-Eq_1.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import scala.language.experimental.erasedDefinitions
12

23
/* This is a version of ../pos/phantomEq.scala that tests phantom with separate compilation */
34
object EqUtil {

tests/pos-custom-args/phantom-Evidence.scala renamed to tests/pos/phantom-Evidence.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.language.experimental.erasedDefinitions
2+
13
/** In this implementation variant of =:= (called =::=) we erase all instantiations and definitions of =::= */
24
object WithNormalState {
35
import Utils.*
@@ -24,5 +26,5 @@ object WithNormalState {
2426

2527
object Utils {
2628
type =::=[From, To]
27-
erased given tpEquals[A]: A =::= A = compiletime.erasedValue
29+
erased given tpEquals[A]: (A =::= A) = compiletime.erasedValue
2830
}

0 commit comments

Comments
 (0)