summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/bug987.check6
-rw-r--r--test/files/neg/t0152.check2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/bug987.check b/test/files/neg/bug987.check
index 5da1e1cbe3..4cad622ab8 100644
--- a/test/files/neg/bug987.check
+++ b/test/files/neg/bug987.check
@@ -1,16 +1,16 @@
bug987.scala:15: error: illegal inheritance;
class E inherits different type instances of trait B:
-B[C] and B[D]
+B[D] and B[C]
class E extends D
^
bug987.scala:20: error: illegal inheritance;
class F inherits different type instances of trait B:
-B[C] and B[D]
+B[D] and B[C]
class F extends D
^
bug987.scala:25: error: illegal inheritance;
class D inherits different type instances of trait B:
-B[C] and B[D]
+B[D] and B[C]
abstract class D extends C with B[D] {}
^
bug987.scala:25: error: type arguments [D] do not conform to trait B's type parameter bounds [T <: B[T]]
diff --git a/test/files/neg/t0152.check b/test/files/neg/t0152.check
index 391f3fbb64..562e6f1c2c 100644
--- a/test/files/neg/t0152.check
+++ b/test/files/neg/t0152.check
@@ -1,6 +1,6 @@
t0152.scala:10: error: illegal inheritance;
object boom inherits different type instances of class Value:
-Value[java.lang.String] and Value[Int]
+Value[Int] and Value[java.lang.String]
object boom extends Value[java.lang.String]("foo") with PlusOne
^
one error found