[commit: testsuite] master: Error message wibbles (5a7e766)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5a7e7665ba81f5fc07f9e504efbe7410f68179a9

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

commit 5a7e7665ba81f5fc07f9e504efbe7410f68179a9
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jan 25 12:14:04 2013 +0000

    Error message wibbles

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

 tests/indexed-types/should_compile/T3017.stderr |    2 +-
 tests/polykinds/T5716.stderr                    |    8 +++-----
 tests/typecheck/should_compile/tc231.stderr     |    4 ++--
 tests/typecheck/should_fail/T3468.stderr        |    4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/indexed-types/should_compile/T3017.stderr b/tests/indexed-types/should_compile/T3017.stderr
index b7bedae..28ddc14 100644
--- a/tests/indexed-types/should_compile/T3017.stderr
+++ b/tests/indexed-types/should_compile/T3017.stderr
@@ -11,7 +11,7 @@ TYPE CONSTRUCTORS
   ListColl :: * -> *
   data ListColl a
       No C type associated
-      RecFlag NonRecursive
+      RecFlag NonRecursive, Promotable
       = L :: forall a. [a] -> ListColl a Stricts: _
       FamilyInstance: none
 COERCION AXIOMS
diff --git a/tests/polykinds/T5716.stderr b/tests/polykinds/T5716.stderr
index 7e38d01..165f32b 100644
--- a/tests/polykinds/T5716.stderr
+++ b/tests/polykinds/T5716.stderr
@@ -1,6 +1,4 @@
 
-T5716.hs:13:33:
-    `U1' of type `DF Int -> U' is not promotable
-    In the type `I (U1 DFInt)'
-    In the definition of data constructor `I1'
-    In the data declaration for `I'
+T5716.hs:13:11:
+    `U' of kind `*' is not promotable
+    In the kind `U -> *'
diff --git a/tests/typecheck/should_compile/tc231.stderr b/tests/typecheck/should_compile/tc231.stderr
index 0e9196c..99f7dfd 100644
--- a/tests/typecheck/should_compile/tc231.stderr
+++ b/tests/typecheck/should_compile/tc231.stderr
@@ -8,14 +8,14 @@ TYPE CONSTRUCTORS
   Q :: * -> * -> * -> *
   data Q s a chain
       No C type associated
-      RecFlag NonRecursive
+      RecFlag NonRecursive, Promotable
       = Node :: forall s a chain. s -> a -> chain -> Q s a chain
             Stricts: _ _ _
       FamilyInstance: none
   Z :: * -> *
   data Z a
       No C type associated
-      RecFlag NonRecursive
+      RecFlag NonRecursive, Promotable
       = Z :: forall a. a -> Z a Stricts: _
       FamilyInstance: none
   Zork :: * -> * -> * -> Constraint
diff --git a/tests/typecheck/should_fail/T3468.stderr b/tests/typecheck/should_fail/T3468.stderr
index ac040ba..1dcc348 100644
--- a/tests/typecheck/should_fail/T3468.stderr
+++ b/tests/typecheck/should_fail/T3468.stderr
@@ -3,10 +3,10 @@ T3468.hs-boot:3:6:
     Type constructor `Tool' has conflicting definitions in the module and its hs-boot file
     Main module: data Tool d
                      No C type associated
-                     RecFlag Recursive
+                     RecFlag Recursive, Promotable
                      = F :: forall d a r. a -> Tool d Stricts: _
                      FamilyInstance: none
     Boot file:   abstract(False) Tool
                      No C type associated
-                     RecFlag NonRecursive
+                     RecFlag NonRecursive, Not promotable
                      FamilyInstance: none