added Iterator.flatten method; refactoring: clo...

added Iterator.flatten method; refactoring: closure -> baseTypeSeq

2 files changed, 5 insertions, 5 deletions

diff --git a/test/files/neg/bug987.check b/test/files/neg/bug987.check
index 4cad622ab8..5da1e1cbe3 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[D] and B[C]
+B[C] and B[D]
 class E extends D
       ^
 bug987.scala:20: error: illegal inheritance;
  class F inherits different type instances of trait B:
-B[D] and B[C]
+B[C] and B[D]
 class F extends D
       ^
 bug987.scala:25: error: illegal inheritance;
  class D inherits different type instances of trait B:
-B[D] and B[C]
+B[C] and B[D]
 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 84f78dc83c..391f3fbb64 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[Int] and Value[java.lang.String]
- object boom extends Value[java.lang.String]("foo") with PlusOne
+Value[java.lang.String] and Value[Int]
+ object boom extends Value[java.lang.String]("foo") with PlusOne

         ^
 one error found