[commit: ghc] wip/T15809: Wibbles (5233e4f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T15809
Link       : http://ghc.haskell.org/trac/ghc/changeset/5233e4f77df6f2fe6426afdbb471191ac13f7070/ghc

>---------------------------------------------------------------

commit 5233e4f77df6f2fe6426afdbb471191ac13f7070
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 12 17:43:48 2018 +0000

    Wibbles


>---------------------------------------------------------------

5233e4f77df6f2fe6426afdbb471191ac13f7070
 testsuite/tests/indexed-types/should_fail/T7536.stderr | 8 ++++----
 testsuite/tests/indexed-types/should_fail/T7938.hs     | 6 ++----
 testsuite/tests/indexed-types/should_fail/T7938.stderr | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/testsuite/tests/indexed-types/should_fail/T7536.stderr b/testsuite/tests/indexed-types/should_fail/T7536.stderr
index 9e7ed30..34a393e 100644
--- a/testsuite/tests/indexed-types/should_fail/T7536.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7536.stderr
@@ -1,5 +1,5 @@
 
-T7536.hs:8:15:
-    Family instance purports to bind type variable ‘a’
-      but the real LHS (expanding synonyms) is: TF Int = ...
-    In the type instance declaration for ‘TF’
+T7536.hs:8:15: error:
+    • LHS of family instance fails to bind type variable ‘a’
+        The real LHS (expanding synonyms) is: TF Int
+    • In the type instance declaration for ‘TF’
diff --git a/testsuite/tests/indexed-types/should_fail/T7938.hs b/testsuite/tests/indexed-types/should_fail/T7938.hs
index f1e8266..246015d 100644
--- a/testsuite/tests/indexed-types/should_fail/T7938.hs
+++ b/testsuite/tests/indexed-types/should_fail/T7938.hs
@@ -8,7 +8,5 @@ data KProxy (a :: *) = KP
 class Foo (a :: k1) (b :: k2) where
   type Bar a
 
--- instance Foo (a :: k1) (b :: k2) where
---   type Bar a = (KP :: KProxy k2)
-
--- 
\ No newline at end of file
+instance Foo (a :: k1) (b :: k2) where
+  type Bar a = (KP :: KProxy k2)
diff --git a/testsuite/tests/indexed-types/should_fail/T7938.stderr b/testsuite/tests/indexed-types/should_fail/T7938.stderr
index 890be7b..5751c4e 100644
--- a/testsuite/tests/indexed-types/should_fail/T7938.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T7938.stderr
@@ -1,6 +1,6 @@
 
 T7938.hs:12:17: error:
-    • Expected a type, but ‘KP :: KProxy k2’ has kind ‘KProxy k4’
+    • Expected a type, but ‘KP :: KProxy k2’ has kind ‘KProxy k2’
     • In the type ‘(KP :: KProxy k2)’
       In the type instance declaration for ‘Bar’
       In the instance declaration for ‘Foo (a :: k1) (b :: k2)’