[commit: ghc] ghc-8.2: Update test output (bb51a99)

git at git.haskell.org git at git.haskell.org
Wed Mar 15 13:17:43 UTC 2017


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

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/bb51a99bb553d80d0f8458de2e228a814ca3f86e/ghc

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

commit bb51a99bb553d80d0f8458de2e228a814ca3f86e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Mar 14 23:45:44 2017 -0400

    Update test output


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

bb51a99bb553d80d0f8458de2e228a814ca3f86e
 .../partial-sigs/should_fail/NamedExtraConstraintsWildcard.stderr | 2 +-
 .../partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr   | 2 +-
 testsuite/tests/typecheck/should_compile/tc141.stderr             | 4 ++--
 testsuite/tests/typecheck/should_compile/tc168.stderr             | 8 ++++----
 testsuite/tests/typecheck/should_fail/T2714.stderr                | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testsuite/tests/partial-sigs/should_fail/NamedExtraConstraintsWildcard.stderr b/testsuite/tests/partial-sigs/should_fail/NamedExtraConstraintsWildcard.stderr
index 43ba8cc..e0b5c17 100644
--- a/testsuite/tests/partial-sigs/should_fail/NamedExtraConstraintsWildcard.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/NamedExtraConstraintsWildcard.stderr
@@ -3,7 +3,7 @@ NamedExtraConstraintsWildcard.hs:5:1: error:
     • Could not deduce: w0
       from the context: (Eq a, w)
         bound by the inferred type for ‘foo’:
-                   (Eq a, w) => a -> a
+                   forall (w :: Constraint) a. (Eq a, w) => a -> a
         at NamedExtraConstraintsWildcard.hs:5:1-15
     • In the ambiguity check for the inferred type for ‘foo’
       To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
diff --git a/testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr b/testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr
index 0f21053..b1d7e3c 100644
--- a/testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotInMonotype.stderr
@@ -3,7 +3,7 @@ NamedWildcardsNotInMonotype.hs:5:1: error:
     • Could not deduce (Eq w0)
       from the context: (Show a, Eq w, Eq a)
         bound by the inferred type for ‘foo’:
-                   (Show a, Eq w, Eq a) => a -> a -> String
+                   forall w a. (Show a, Eq w, Eq a) => a -> a -> String
         at NamedWildcardsNotInMonotype.hs:5:1-33
       The type variable ‘w0’ is ambiguous
     • In the ambiguity check for the inferred type for ‘foo’
diff --git a/testsuite/tests/typecheck/should_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index 7d0f081..309fdfe 100644
--- a/testsuite/tests/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
@@ -11,7 +11,7 @@ tc141.hs:11:31: error:
         because type variable ‘a2’ would escape its scope
       This (rigid, skolem) type variable is bound by
         an expression type signature:
-          a2
+          forall a2. a2
         at tc141.hs:11:34
     • In the expression: q :: a
       In the expression: (q :: a, p)
@@ -39,7 +39,7 @@ tc141.hs:15:18: error:
         because type variable ‘a2’ would escape its scope
       This (rigid, skolem) type variable is bound by
         the type signature for:
-          v :: a2
+          v :: forall a2. a2
         at tc141.hs:14:14-19
     • In the expression: b
       In an equation for ‘v’: v = b
diff --git a/testsuite/tests/typecheck/should_compile/tc168.stderr b/testsuite/tests/typecheck/should_compile/tc168.stderr
index d36c58d..fd45a28 100644
--- a/testsuite/tests/typecheck/should_compile/tc168.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc168.stderr
@@ -1,12 +1,12 @@
 
 tc168.hs:17:1: error:
-    • Could not deduce (C a (a1, b0))
-      from the context: C a (a1, b)
+    • Could not deduce (C a1 (a, b0))
+      from the context: C a1 (a, b)
         bound by the inferred type for ‘g’:
-                   forall a a1 b. C a (a1, b) => a -> a1
+                   forall b a a1. C a1 (a, b) => a1 -> a
         at tc168.hs:17:1-16
       The type variable ‘b0’ is ambiguous
     • In the ambiguity check for the inferred type for ‘g’
       To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
       When checking the inferred type
-        g :: forall a1 a2 b. C a1 (a2, b) => a1 -> a2
+        g :: forall b a1 a2. C a2 (a1, b) => a2 -> a1
diff --git a/testsuite/tests/typecheck/should_fail/T2714.stderr b/testsuite/tests/typecheck/should_fail/T2714.stderr
index 9b3fc34..c016586 100644
--- a/testsuite/tests/typecheck/should_fail/T2714.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2714.stderr
@@ -1,10 +1,10 @@
 
 T2714.hs:8:5: error:
-    • Couldn't match type ‘c’ with ‘f0 (a -> b)’
-      ‘c’ is a rigid type variable bound by
+    • Couldn't match type ‘a’ with ‘f0 b’
+      ‘a’ is a rigid type variable bound by
         the type signature for:
-          f :: ((a -> b) -> b) -> forall c. c -> a
-        at T2714.hs:8:1-9
+          f :: forall a b. ((a -> b) -> b) -> forall c. c -> a
+        at T2714.hs:7:1-42
       Expected type: ((a -> b) -> b) -> c -> a
         Actual type: ((a -> b) -> b) -> f0 (a -> b) -> f0 b
     • In the expression: ffmap



More information about the ghc-commits mailing list