[commit: ghc] ghc-8.4: testsuite: Fix test output broken by efba054640d3 (233c5ce)

git at git.haskell.org git at git.haskell.org
Thu Feb 1 04:51:58 UTC 2018


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

On branch  : ghc-8.4
Link       : http://ghc.haskell.org/trac/ghc/changeset/233c5ced6e9e9ac9f8f91f4bfecb73a6274daefd/ghc

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

commit 233c5ced6e9e9ac9f8f91f4bfecb73a6274daefd
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Jan 31 23:02:52 2018 -0500

    testsuite: Fix test output broken by efba054640d3
    
    Looks right to me.
    
    (cherry picked from commit 7d9812e8f4e8723c94a8ee9f7ba629ac9f1d4e71)


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

233c5ced6e9e9ac9f8f91f4bfecb73a6274daefd
 testsuite/tests/typecheck/should_fail/T10619.stderr |  4 ++--
 testsuite/tests/typecheck/should_fail/T5691.stderr  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/testsuite/tests/typecheck/should_fail/T10619.stderr b/testsuite/tests/typecheck/should_fail/T10619.stderr
index 0cd5364..fde2daf 100644
--- a/testsuite/tests/typecheck/should_fail/T10619.stderr
+++ b/testsuite/tests/typecheck/should_fail/T10619.stderr
@@ -1,6 +1,6 @@
 
 T10619.hs:9:15: error:
-    • Couldn't match type ‘b -> b’ with ‘forall a. a -> a’
+    • Couldn't match type ‘forall a. a -> a’ with ‘b -> b’
       Expected type: (b -> b) -> b -> b
         Actual type: (forall a. a -> a) -> b -> b
     • In the expression:
@@ -40,7 +40,7 @@ T10619.hs:14:15: error:
         bar :: p -> (b -> b) -> b -> b (bound at T10619.hs:12:1)
 
 T10619.hs:16:13: error:
-    • Couldn't match type ‘b -> b’ with ‘forall a. a -> a’
+    • Couldn't match type ‘forall a. a -> a’ with ‘b -> b’
       Expected type: (b -> b) -> b -> b
         Actual type: (forall a. a -> a) -> b -> b
     • In the expression:
diff --git a/testsuite/tests/typecheck/should_fail/T5691.stderr b/testsuite/tests/typecheck/should_fail/T5691.stderr
index 9d4e587..ad5c7e4 100644
--- a/testsuite/tests/typecheck/should_fail/T5691.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5691.stderr
@@ -1,12 +1,12 @@
 
-T5691.hs:15:24: error:
+T5691.hs:14:9: error:
     • Couldn't match type ‘p’ with ‘PrintRuleInterp’
       Expected type: PrintRuleInterp a
         Actual type: p a
-    • In the first argument of ‘printRule_’, namely ‘f’
-      In the second argument of ‘($)’, namely ‘printRule_ f’
-      In the expression: MkPRI $ printRule_ f
-    • Relevant bindings include f :: p a (bound at T5691.hs:14:9)
+    • When checking that the pattern signature: p a
+        fits the type of its context: PrintRuleInterp a
+      In the pattern: f :: p a
+      In an equation for ‘test’: test (f :: p a) = MkPRI $ printRule_ f
 
 T5691.hs:24:10: error:
     • No instance for (Alternative RecDecParser)



More information about the ghc-commits mailing list