aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/dotc/tests.scala2
-rw-r--r--tests/neg/clashes.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 468de7243..db5fa8544 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -143,7 +143,7 @@ class tests extends CompilerTest {
@Test def neg_badAuxConstr = compileFile(negDir, "badAuxConstr", xerrors = 2)
@Test def neg_typetest = compileFile(negDir, "typetest", xerrors = 1)
@Test def neg_t1569_failedAvoid = compileFile(negDir, "t1569-failedAvoid", xerrors = 1)
- @Test def neg_clashes = compileFile(negDir, "clashes", xerrors = 3)
+ @Test def neg_clashes = compileFile(negDir, "clashes", xerrors = 2)
@Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 8)
@Test def neg_boundspropagation = compileFile(negDir, "boundspropagation", xerrors = 5)
@Test def neg_refinedSubtyping = compileFile(negDir, "refinedSubtyping", xerrors = 2)
diff --git a/tests/neg/clashes.scala b/tests/neg/clashes.scala
index 11354706d..6c051953d 100644
--- a/tests/neg/clashes.scala
+++ b/tests/neg/clashes.scala
@@ -1,6 +1,6 @@
object Test {
class C
- type C
+ type C // error
}
-object Test
+object Test // error