[commit: testsuite] master: Further testsuite wibbles following changes to kind suppression (46da2e5)

[git at git.haskell.org]

Repository : ssh://git at git.haskell.org/testsuite

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/46da2e58a6132fda7c1c3a98d8038e33050ecce6/testsuite

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

commit 46da2e58a6132fda7c1c3a98d8038e33050ecce6
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Oct 2 09:00:55 2013 +0100

    Further testsuite wibbles following changes to kind suppression


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

46da2e58a6132fda7c1c3a98d8038e33050ecce6
 tests/ghci/scripts/T7873.stdout              |    3 +--
 tests/indexed-types/should_fail/T7786.stderr |    4 ++--
 tests/indexed-types/should_fail/T7967.stderr |    4 ++--
 tests/polykinds/T7230.stderr                 |    4 ++--
 tests/roles/should_compile/Roles1.stderr     |    6 +++---
 tests/th/TH_Roles2.stderr                    |    2 +-
 tests/typecheck/should_fail/T2247.stderr     |    4 ++--
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/tests/ghci/scripts/T7873.stdout b/tests/ghci/scripts/T7873.stdout
index 844e8da..785fbf0 100644
--- a/tests/ghci/scripts/T7873.stdout
+++ b/tests/ghci/scripts/T7873.stdout
@@ -1,6 +1,5 @@
 data D1 where
-  MkD1 :: (forall (k :: BOX) (p :: k -> *) (a :: k).
-           p a -> Int) -> D1
+  MkD1 :: (forall (p :: k -> *) (a :: k). p a -> Int) -> D1
   	-- Defined at <interactive>:3:6
 data D2 where
   MkD2 :: (forall (p :: k -> *) (a :: k). p a -> Int) -> D2
diff --git a/tests/indexed-types/should_fail/T7786.stderr b/tests/indexed-types/should_fail/T7786.stderr
index 85a1be2..8c1f64e 100644
--- a/tests/indexed-types/should_fail/T7786.stderr
+++ b/tests/indexed-types/should_fail/T7786.stderr
@@ -1,9 +1,9 @@
 
 T7786.hs:86:22:
-    Couldn't match type ?xxx? with ?'Empty [KeySegment]?
+    Couldn't match type ?xxx? with ?'Empty?
     Inaccessible code in
       a pattern with constructor
-        Nil :: forall (k :: BOX). Sing (Inventory k) ('Empty k),
+        Nil :: Sing 'Empty,
       in a pattern binding in
            'do' block
     In the pattern: Nil
diff --git a/tests/indexed-types/should_fail/T7967.stderr b/tests/indexed-types/should_fail/T7967.stderr
index 57560fe..6200776 100644
--- a/tests/indexed-types/should_fail/T7967.stderr
+++ b/tests/indexed-types/should_fail/T7967.stderr
@@ -1,7 +1,7 @@
 
 T7967.hs:31:26:
-    Couldn't match type ?'[] *? with ?(':) * h0 t0?
+    Couldn't match type ?'[]? with ?h0 : t0?
     Expected type: Index n l
-      Actual type: Index 'Zero ((':) * h0 t0)
+      Actual type: Index 'Zero (h0 : t0)
     In the expression: IZero
     In an equation for ?sNatToIndex?: sNatToIndex SZero HNil = IZero
diff --git a/tests/polykinds/T7230.stderr b/tests/polykinds/T7230.stderr
index ae259dd..ab9037d 100644
--- a/tests/polykinds/T7230.stderr
+++ b/tests/polykinds/T7230.stderr
@@ -7,13 +7,13 @@ T7230.hs:48:32:
       at T7230.hs:47:10-68
     or from (xs ~ (x : xs1))
       bound by a pattern with constructor
-                 SCons :: forall (k :: BOX) (x :: k) (xs :: [k]).
+                 SCons :: forall (x :: k) (xs :: [k]).
                           Sing x -> Sing xs -> Sing (x : xs),
                in an equation for ?crash?
       at T7230.hs:48:8-27
     or from (xs1 ~ (x1 : xs2))
       bound by a pattern with constructor
-                 SCons :: forall (k :: BOX) (x :: k) (xs :: [k]).
+                 SCons :: forall (x :: k) (xs :: [k]).
                           Sing x -> Sing xs -> Sing (x : xs),
                in an equation for ?crash?
       at T7230.hs:48:17-26
diff --git a/tests/roles/should_compile/Roles1.stderr b/tests/roles/should_compile/Roles1.stderr
index e56cfb4..e1808e8 100644
--- a/tests/roles/should_compile/Roles1.stderr
+++ b/tests/roles/should_compile/Roles1.stderr
@@ -14,7 +14,7 @@ TYPE CONSTRUCTORS
       RecFlag NonRecursive, Promotable
       = K2 :: forall a. a -> T2 a Stricts: _
       FamilyInstance: none
-  T3 :: forall (k :: BOX). k -> *
+  T3 :: k -> *
   data T3 (k::BOX) (a::k)
       No C type associated
       Roles: [nominal, phantom]
@@ -35,14 +35,14 @@ TYPE CONSTRUCTORS
       RecFlag NonRecursive, Promotable
       = K5 :: forall a. a -> T5 a Stricts: _
       FamilyInstance: none
-  T6 :: forall (k :: BOX). k -> *
+  T6 :: k -> *
   data T6 (k::BOX) (a::k)
       No C type associated
       Roles: [nominal, phantom]
       RecFlag NonRecursive, Not promotable
       = K6 :: forall (k::BOX) (a::k). T6 k a
       FamilyInstance: none
-  T7 :: forall (k :: BOX). k -> * -> *
+  T7 :: k -> * -> *
   data T7 (k::BOX) (a::k) b
       No C type associated
       Roles: [nominal, phantom, representational]
diff --git a/tests/th/TH_Roles2.stderr b/tests/th/TH_Roles2.stderr
index b828ed1..325f9df 100644
--- a/tests/th/TH_Roles2.stderr
+++ b/tests/th/TH_Roles2.stderr
@@ -1,6 +1,6 @@
 TYPE SIGNATURES
 TYPE CONSTRUCTORS
-  T :: forall (k :: BOX). k -> *
+  T :: k -> *
   data T (k::BOX) (a::k)
       No C type associated
       Roles: [nominal, representational]
diff --git a/tests/typecheck/should_fail/T2247.stderr b/tests/typecheck/should_fail/T2247.stderr
index 667a117..3a5dce4 100644
--- a/tests/typecheck/should_fail/T2247.stderr
+++ b/tests/typecheck/should_fail/T2247.stderr
@@ -2,6 +2,6 @@
 T2247.hs:6:10:
     Illegal instance declaration for ?FD a b?
       The liberal coverage condition fails in class ?FD?
-        for functional dependency: ?x -> y?
-      Reason: ?a? do not jointly determine ?b?
+        for functional dependency: ?a -> b?
+      Reason: lhs type ?a? does not deternine rhs type ?b?
     In the instance declaration for ?FD a b?