aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/dotc/tests.scala4
-rw-r--r--tests/neg/bounds.scala2
-rw-r--r--tests/neg/hklower.scala2
3 files changed, 3 insertions, 5 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 47ac00c6f..8c61f56b7 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -110,7 +110,7 @@ class tests extends CompilerTest {
@Test def neg_abstractOverride() = compileFile(negDir, "abstract-override", xerrors = 2)
@Test def neg_blockescapes() = compileFile(negDir, "blockescapesNeg", xerrors = 1)
- @Test def neg_bounds() = compileFile(negDir, "bounds", xerrors = 3)
+ @Test def neg_bounds() = compileFile(negDir, "bounds", xerrors = 2)
@Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 3)
@Test def neg_typedIdents() = compileDir(negDir, "typedIdents", xerrors = 2)
@Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3)
@@ -150,7 +150,7 @@ class tests extends CompilerTest {
@Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 9)
@Test def neg_boundspropagation = compileFile(negDir, "boundspropagation", xerrors = 5)
@Test def neg_refinedSubtyping = compileFile(negDir, "refinedSubtyping", xerrors = 2)
- @Test def neg_hklower = compileFile(negDir, "hklower", xerrors = 3)
+ @Test def neg_hklower = compileFile(negDir, "hklower", xerrors = 4)
@Test def neg_Iter2 = compileFile(negDir, "Iter2", xerrors = 2)
@Test def neg_i0091_infpaths = compileFile(negDir, "i0091-infpaths", xerrors = 3)
@Test def neg_i0248_inherit_refined = compileFile(negDir, "i0248-inherit-refined", xerrors = 4)
diff --git a/tests/neg/bounds.scala b/tests/neg/bounds.scala
index 55eec6941..cd6b8d05c 100644
--- a/tests/neg/bounds.scala
+++ b/tests/neg/bounds.scala
@@ -1,9 +1,7 @@
object Test {
- class C[B >: String <: Int](x: B)
def g[B >: String <: Int](x: B): Int = x
def main(args: Array[String]): Unit = {
g("foo")
- new C("bar")
}
def baz[X >: Y, Y <: String](x: X, y: Y) = (x, y)
diff --git a/tests/neg/hklower.scala b/tests/neg/hklower.scala
index e29a1545e..5c1ba27ba 100644
--- a/tests/neg/hklower.scala
+++ b/tests/neg/hklower.scala
@@ -1,4 +1,4 @@
-class Test {
+class Test { // error conflicting bounds
type T[X] // OK
type U[X] = T[X] // OK