[commit: ghc] master: Fix test output after 'Some tidying up of type pretty-printing' (09d5c99)

git at git.haskell.org git at git.haskell.org
Sat May 27 14:45:01 UTC 2017


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/09d5c993aae208e3d34a9e715297922b6ea42b3f/ghc

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

commit 09d5c993aae208e3d34a9e715297922b6ea42b3f
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Sat May 27 07:42:26 2017 -0700

    Fix test output after 'Some tidying up of type pretty-printing'
    
    Most are cosmetic. There's an interesting change in T7861,
    but the error is still accurate.


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

09d5c993aae208e3d34a9e715297922b6ea42b3f
 testsuite/tests/typecheck/should_run/T7861.stderr     | 6 +-----
 testsuite/tests/typecheck/should_run/Typeable1.stderr | 2 +-
 testsuite/tests/typecheck/should_run/tcrun045.stderr  | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/testsuite/tests/typecheck/should_run/T7861.stderr b/testsuite/tests/typecheck/should_run/T7861.stderr
index e9ee5e9..4a1c030 100644
--- a/testsuite/tests/typecheck/should_run/T7861.stderr
+++ b/testsuite/tests/typecheck/should_run/T7861.stderr
@@ -1,9 +1,5 @@
 T7861: T7861.hs:10:5: error:
-    • Couldn't match type ‘a’ with ‘[a]’
-      ‘a’ is a rigid type variable bound by
-        the type signature for:
-          f :: forall a. (forall b. a) -> a
-        at T7861.hs:9:1-23
+    • Occurs check: cannot construct the infinite type: a ~ [a]
       Expected type: (forall b. a) -> a
         Actual type: (forall b. a) -> [a]
     • In the expression: doA
diff --git a/testsuite/tests/typecheck/should_run/Typeable1.stderr b/testsuite/tests/typecheck/should_run/Typeable1.stderr
index 9a7d3b7..65f6fd4 100644
--- a/testsuite/tests/typecheck/should_run/Typeable1.stderr
+++ b/testsuite/tests/typecheck/should_run/Typeable1.stderr
@@ -7,7 +7,7 @@ Typeable1.hs:22:5: error:
           App :: forall k2 (t :: k2).
                  () =>
                  forall k1 (a :: k1 -> k2) (b :: k1).
-                 t ~ a b =>
+                 (t ~ a b) =>
                  TypeRep a -> TypeRep b -> TypeRep t,
         in a pattern binding in
              'do' block
diff --git a/testsuite/tests/typecheck/should_run/tcrun045.stderr b/testsuite/tests/typecheck/should_run/tcrun045.stderr
index 19fca10..f6b1652 100644
--- a/testsuite/tests/typecheck/should_run/tcrun045.stderr
+++ b/testsuite/tests/typecheck/should_run/tcrun045.stderr
@@ -1,18 +1,18 @@
 
 tcrun045.hs:11:10: error:
     • Illegal implicit parameter ‘?imp::Int’
-    • In the context: (?imp::Int)
+    • In the context: ?imp::Int
       While checking an instance declaration
       In the instance declaration for ‘C Int’
 
 tcrun045.hs:24:1: error:
     • Illegal implicit parameter ‘?imp::Int’
-    • In the context: (?imp::Int)
+    • In the context: ?imp::Int
       While checking the super-classes of class ‘D’
       In the class declaration for ‘D’
 
 tcrun045.hs:27:10: error:
     • Illegal implicit parameter ‘?imp::Int’
-    • In the context: (?imp::Int)
+    • In the context: ?imp::Int
       While checking an instance declaration
       In the instance declaration for ‘D Int’



More information about the ghc-commits mailing list