aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/dotc/tests.scala1
-rw-r--r--tests/neg/t2994.scala (renamed from tests/pending/pos/t2994a.scala)8
-rw-r--r--tests/pending/pos/t2945.scala4
-rw-r--r--tests/pending/pos/t2994b.scala7
4 files changed, 11 insertions, 9 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index b102c5e80..c7b0dc044 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -84,6 +84,7 @@ class tests extends CompilerTest {
@Test def neg_tailcall2 = compileFile(negDir, "tailcall/tailrec-2", xerrors = 2)
@Test def neg_tailcall3 = compileFile(negDir, "tailcall/tailrec-3", xerrors = 2)
@Test def neg_t1843 = compileFile(negDir, "t1843", xerrors = 1)
+ @Test def neg_t2994 = compileFile(negDir, "t2994", xerrors = 13)
@Test def dotc = compileDir(dotcDir + "tools/dotc", twice)
@Test def dotc_ast = compileDir(dotcDir + "tools/dotc/ast", twice)
diff --git a/tests/pending/pos/t2994a.scala b/tests/neg/t2994.scala
index f1a4a4a12..f3009b12f 100644
--- a/tests/pending/pos/t2994a.scala
+++ b/tests/neg/t2994.scala
@@ -25,3 +25,11 @@ object Naturals {
}
}
+
+object Test {
+ trait Bar[X[_]]
+ trait Baz[S[_] <: Bar[S]] {
+ type Apply[T]
+ }
+ trait Foo[V[_] <: Bar[V]] extends Bar[Baz[V]#Apply]
+}
diff --git a/tests/pending/pos/t2945.scala b/tests/pending/pos/t2945.scala
index 0379e9ba1..54f0a7724 100644
--- a/tests/pending/pos/t2945.scala
+++ b/tests/pending/pos/t2945.scala
@@ -1,9 +1,9 @@
object Foo {
def test(s: String) = {
(s: Seq[Char]) match {
- case Seq('f', 'o', 'o', ' ', rest1 @ _*) =>
+ case Seq('f', 'o', 'o', ' ', rest1: _*) =>
rest1
- case Seq('b', 'a', 'r', ' ', ' ', rest2 @ _*) =>
+ case Seq('b', 'a', 'r', ' ', ' ', rest2: _*) =>
rest2
case _ =>
s
diff --git a/tests/pending/pos/t2994b.scala b/tests/pending/pos/t2994b.scala
deleted file mode 100644
index 8b5eb9692..000000000
--- a/tests/pending/pos/t2994b.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-object Test {
- trait Bar[X[_]]
- trait Baz[S[_] <: Bar[S]] {
- type Apply[T]
- }
- trait Foo[V[_] <: Bar[V]] extends Bar[Baz[V]#Apply]
-}