Wibbleswip/T23070-dicts

7 files changed, 17 insertions, 17 deletions

diff --git a/testsuite/tests/gadt/T3651.stderr b/testsuite/tests/gadt/T3651.stderr
index b4c7a2e65d..aaf69f6dec 100644
--- a/testsuite/tests/gadt/T3651.stderr
+++ b/testsuite/tests/gadt/T3651.stderr
@@ -6,7 +6,7 @@ T3651.hs:11:15: error: [GHC-83865]
     • In the expression: ()
       In an equation for ‘unsafe1’: unsafe1 B U = ()
 
-T3651.hs:14:15: error: [GHC-83865]
+T3651.hs:27:15: error: [GHC-83865]
     • Couldn't match type ‘()’ with ‘Bool’
       Expected: a
         Actual: ()
diff --git a/testsuite/tests/pmcheck/should_compile/T15450.stderr b/testsuite/tests/pmcheck/should_compile/T15450.stderr
index 18f4a931f8..ca5f6ae71c 100644
--- a/testsuite/tests/pmcheck/should_compile/T15450.stderr
+++ b/testsuite/tests/pmcheck/should_compile/T15450.stderr
@@ -1,11 +1,11 @@
 
-T15450.hs:6:7: warning: [GHC-62161] [-Wincomplete-patterns (in -Wextra)]
+T15450.hs:8:7: warning: [GHC-62161] [-Wincomplete-patterns (in -Wextra)]
     Pattern match(es) are non-exhaustive
     In a case alternative:
         Patterns of type ‘Bool’ not matched:
             False
             True
 
-T15450.hs:9:7: warning: [GHC-62161] [-Wincomplete-patterns (in -Wextra)]
+T15450.hs:11:7: warning: [GHC-62161] [-Wincomplete-patterns (in -Wextra)]
     Pattern match(es) are non-exhaustive
     In a case alternative: Patterns of type ‘Bool’ not matched: False
diff --git a/testsuite/tests/typecheck/should_fail/GivenForallLoop.stderr b/testsuite/tests/typecheck/should_fail/GivenForallLoop.stderr
index ae71b40a91..b615c3b86f 100644
--- a/testsuite/tests/typecheck/should_fail/GivenForallLoop.stderr
+++ b/testsuite/tests/typecheck/should_fail/GivenForallLoop.stderr
@@ -1,20 +1,20 @@
 
-GivenForallLoop.hs:8:11: error: [GHC-25897]
+GivenForallLoop.hs:9:11: error: [GHC-25897]
     • Could not deduce ‘a ~ b’
       from the context: a ~ (forall b1. F a b1)
         bound by the type signature for:
                    loopy :: forall a b. (a ~ (forall b1. F a b1)) => a -> b
-        at GivenForallLoop.hs:7:1-42
+        at GivenForallLoop.hs:8:1-42
       ‘a’ is a rigid type variable bound by
         the type signature for:
           loopy :: forall a b. (a ~ (forall b1. F a b1)) => a -> b
-        at GivenForallLoop.hs:7:1-42
+        at GivenForallLoop.hs:8:1-42
       ‘b’ is a rigid type variable bound by
         the type signature for:
           loopy :: forall a b. (a ~ (forall b1. F a b1)) => a -> b
-        at GivenForallLoop.hs:7:1-42
+        at GivenForallLoop.hs:8:1-42
     • In the expression: x
       In an equation for ‘loopy’: loopy x = x
     • Relevant bindings include
-        x :: a (bound at GivenForallLoop.hs:8:7)
-        loopy :: a -> b (bound at GivenForallLoop.hs:8:1)
+        x :: a (bound at GivenForallLoop.hs:9:7)
+        loopy :: a -> b (bound at GivenForallLoop.hs:9:1)
diff --git a/testsuite/tests/typecheck/should_fail/T20189.stderr b/testsuite/tests/typecheck/should_fail/T20189.stderr
index 077f57d6d5..e1dd352506 100644
--- a/testsuite/tests/typecheck/should_fail/T20189.stderr
+++ b/testsuite/tests/typecheck/should_fail/T20189.stderr
@@ -1,12 +1,12 @@
 
-T20189.hs:6:5: error: [GHC-88464]
+T20189.hs:7:5: error: [GHC-88464]
     • Found hole: _ :: t
       Where: ‘t’ is a rigid type variable bound by
                the type signature for:
                  y :: forall t. (t ~ (forall x. Show x => x -> IO ())) => t
-               at T20189.hs:5:1-49
+               at T20189.hs:6:1-49
     • In an equation for ‘y’: y = _
-    • Relevant bindings include y :: t (bound at T20189.hs:6:1)
+    • Relevant bindings include y :: t (bound at T20189.hs:7:1)
       Constraints include
-        t ~ (forall x. Show x => x -> IO ()) (from T20189.hs:5:1-49)
-      Valid hole fits include y :: t (bound at T20189.hs:6:1)
+        t ~ (forall x. Show x => x -> IO ()) (from T20189.hs:6:1-49)
+      Valid hole fits include y :: t (bound at T20189.hs:7:1)
diff --git a/testsuite/tests/typecheck/should_fail/T22924b.stderr b/testsuite/tests/typecheck/should_fail/T22924b.stderr
index ba4bd79198..46f456fc1f 100644
--- a/testsuite/tests/typecheck/should_fail/T22924b.stderr
+++ b/testsuite/tests/typecheck/should_fail/T22924b.stderr
@@ -1,7 +1,7 @@
 
 T22924b.hs:10:5: error:
     • Reduction stack overflow; size = 201
-      When simplifying the following type: R
+      When simplifying the following type: S
       Use -freduction-depth=0 to disable this check
       (any upper bound you could choose might fail unpredictably with
        minor updates to GHC, so disabling the check is recommended if
diff --git a/testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr b/testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr
index bbb18280c7..be1b5928b3 100644
--- a/testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr
+++ b/testsuite/tests/typecheck/should_fail/TcCoercibleFail.stderr
@@ -50,7 +50,7 @@ TcCoercibleFail.hs:30:9: error: [GHC-18872]
 
 TcCoercibleFail.hs:35:8: error:
     • Reduction stack overflow; size = 201
-      When simplifying the following type: Age
+      When simplifying the following type: Fix (Either Age)
       Use -freduction-depth=0 to disable this check
       (any upper bound you could choose might fail unpredictably with
        minor updates to GHC, so disabling the check is recommended if
diff --git a/testsuite/tests/typecheck/should_run/Defer01.hs b/testsuite/tests/typecheck/should_run/Defer01.hs
index 551c626f7c..8fcf999b32 100644
--- a/testsuite/tests/typecheck/should_run/Defer01.hs
+++ b/testsuite/tests/typecheck/should_run/Defer01.hs
@@ -1,8 +1,8 @@
 -- Test -fdefer-type-errors
 -- Should compile and run
-
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE AllowAmbiguousTypes #-}  -- Allows the strange type for `k`
 {-# OPTIONS_GHC -fdefer-type-errors #-}
 
 module Main where