Follow error message changes

I think these are a consequence of my uType_defer fix to
Trac #5631

18 files changed, 152 insertions, 154 deletions

diff --git a/testsuite/tests/gadt/rw.stderr b/testsuite/tests/gadt/rw.stderr
index 612c809fb8..4c0c0ce6cd 100644
--- a/testsuite/tests/gadt/rw.stderr
+++ b/testsuite/tests/gadt/rw.stderr
@@ -1,20 +1,19 @@
-
-rw.hs:14:42:
-    Couldn't match type `a' with `Int'
-      `a' is a rigid type variable bound by
-          the type signature for writeInt :: T a -> IORef a -> IO ()
-          at rw.hs:13:1
-    Expected type: IORef Int
-      Actual type: IORef a
-    In the first argument of `writeIORef', namely `ref'
-    In the expression: writeIORef ref (1 :: Int)
-
-rw.hs:19:34:
-    Couldn't match type `a' with `Bool'
-      `a' is a rigid type variable bound by
-          the type signature for readBool :: T a -> IORef a -> IO ()
-          at rw.hs:17:1
-    Expected type: IORef Bool
-      Actual type: IORef a
-    In the first argument of `readIORef', namely `ref'
-    In the first argument of `(>>=)', namely `readIORef ref'
+

+rw.hs:14:47:

+    Couldn't match type `a' with `Int'

+      `a' is a rigid type variable bound by

+          the type signature for writeInt :: T a -> IORef a -> IO ()

+          at rw.hs:13:1

+    In the second argument of `writeIORef', namely `(1 :: Int)'

+    In the expression: writeIORef ref (1 :: Int)

+    In a case alternative: ~(Li x) -> writeIORef ref (1 :: Int)

+

+rw.hs:19:51:

+    Couldn't match type `a' with `Bool'

+      `a' is a rigid type variable bound by

+          the type signature for readBool :: T a -> IORef a -> IO ()

+          at rw.hs:17:1

+    Expected type: a -> Bool

+      Actual type: Bool -> Bool

+    In the second argument of `(.)', namely `not'

+    In the second argument of `(>>=)', namely `(print . not)'

diff --git a/testsuite/tests/indexed-types/should_fail/T2664.stderr b/testsuite/tests/indexed-types/should_fail/T2664.stderr
index 6deebb601f..a4a1a24a85 100644
--- a/testsuite/tests/indexed-types/should_fail/T2664.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2664.stderr
@@ -1,6 +1,6 @@
 

-T2664.hs:31:78:

-    Could not deduce (a ~ b)

+T2664.hs:31:33:

+    Could not deduce (Dual b ~ Dual a)

     from the context (Connect a, Connect b)

       bound by the instance declaration at T2664.hs:22:10-52

     or from ((a :*: b) ~ Dual c, c ~ Dual (a :*: b))

@@ -8,13 +8,11 @@ T2664.hs:31:78:
                  newPChan :: ((a :*: b) ~ Dual c, c ~ Dual (a :*: b)) =>

                              IO (PChan (a :*: b), PChan c)

       at T2664.hs:(23,5)-(31,87)

-      `a' is a rigid type variable bound by

-          the instance declaration at T2664.hs:22:19

-      `b' is a rigid type variable bound by

-          the instance declaration at T2664.hs:22:30

-    Expected type: Dual (Dual b)

-      Actual type: a

-    In the third argument of `pchoose', namely `newPChan'

-    In the second argument of `E', namely `(pchoose Left v newPChan)'

+    NB: `Dual' is a type function, and may not be injective

+    Expected type: c

+      Actual type: Dual b :+: Dual a

+    Expected type: PChan c

+      Actual type: PChan (Dual b :+: Dual a)

+    In the return type of a call of `E'

     In the expression:

       E (pchoose Right v newPChan) (pchoose Left v newPChan)

diff --git a/testsuite/tests/simplCore/should_compile/simpl017.stderr b/testsuite/tests/simplCore/should_compile/simpl017.stderr
index d82014bdb9..325920fd57 100644
--- a/testsuite/tests/simplCore/should_compile/simpl017.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl017.stderr
@@ -1,20 +1,20 @@
-
-simpl017.hs:44:12:
-    Couldn't match expected type `forall v. [E m i] -> E' v m a'
-                with actual type `[E m i] -> E' v0 m0 e0'
-    In the first argument of `return', namely `f'
-    In a stmt of a 'do' block: return f
-    In the first argument of `E', namely
-      `(do { let ix :: [E m i] -> m i
-                 ix [i] = runE i
-                 {-# INLINE f #-}
-                 ....;
-             return f })'
-
-simpl017.hs:63:5:
-    Couldn't match expected type `t0 -> t1'
-                with actual type `forall v. [E m0 Int] -> E' v m0 Int'
-    The function `a' is applied to one argument,
-    but its type `forall v. [E m0 Int] -> E' v m0 Int' has none
-    In the first argument of `plus', namely `a [one]'
-    In a stmt of a 'do' block: a [one] `plus` a [one]
+

+simpl017.hs:44:12:

+    Couldn't match expected type `forall v. [E m i] -> E' v m a'

+                with actual type `[E m i] -> E' v0 m a'

+    In the first argument of `return', namely `f'

+    In a stmt of a 'do' block: return f

+    In the first argument of `E', namely

+      `(do { let ix :: [E m i] -> m i

+                 ix [i] = runE i

+                 {-# INLINE f #-}

+                 ....;

+             return f })'

+

+simpl017.hs:63:5:

+    Couldn't match expected type `t0 -> t1'

+                with actual type `forall v. [E m0 Int] -> E' v m0 Int'

+    The function `a' is applied to one argument,

+    but its type `forall v. [E m0 Int] -> E' v m0 Int' has none

+    In the first argument of `plus', namely `a [one]'

+    In a stmt of a 'do' block: a [one] `plus` a [one]

diff --git a/testsuite/tests/typecheck/should_fail/T2688.stderr b/testsuite/tests/typecheck/should_fail/T2688.stderr
index 817c7202e5..a658d7395d 100644
--- a/testsuite/tests/typecheck/should_fail/T2688.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2688.stderr
@@ -1,5 +1,5 @@
 

-T2688.hs:8:14:

+T2688.hs:8:22:

     Could not deduce (s ~ v)

     from the context (VectorSpace v s)

       bound by the class declaration for `VectorSpace'

@@ -8,5 +8,6 @@ T2688.hs:8:14:
           the class declaration for `VectorSpace' at T2688.hs:5:21

       `v' is a rigid type variable bound by

           the class declaration for `VectorSpace' at T2688.hs:5:19

+    In the second argument of `(/)', namely `s'

+    In the second argument of `(*^)', namely `(1 / s)'

     In the expression: v *^ (1 / s)

-    In an equation for `^/': v ^/ s = v *^ (1 / s)

diff --git a/testsuite/tests/typecheck/should_fail/T3592.stderr b/testsuite/tests/typecheck/should_fail/T3592.stderr
index ce3eb90195..c2c96cc873 100644
--- a/testsuite/tests/typecheck/should_fail/T3592.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3592.stderr
@@ -6,9 +6,8 @@ T3592.hs:8:5:
     In the expression: show

     In an equation for `f': f = show

 

-T3592.hs:11:12:

+T3592.hs:11:7:

     No instance for (Show a)

-      arising from a use of `x'

-    In the first argument of `show', namely `x'

+      arising from a use of `show'

     In the expression: show x

     In an equation for `g': g x = show x

diff --git a/testsuite/tests/typecheck/should_fail/T3950.stderr b/testsuite/tests/typecheck/should_fail/T3950.stderr
index 8eb1ab9a4d..8e6f948524 100644
--- a/testsuite/tests/typecheck/should_fail/T3950.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3950.stderr
@@ -1,7 +1,7 @@
-
-T3950.hs:15:13:
-    Couldn't match expected type `Id p' with actual type `Id p0 x0'
-    Expected type: w (Id p)
-      Actual type: Sealed (Id p0 x0)
-    In the first argument of `Just', namely rp'
-    In the expression: Just rp'
+

+T3950.hs:15:13:

+    Couldn't match expected type `Id p' with actual type `Id p x0'

+    Expected type: w (Id p)

+      Actual type: Sealed (Id p x0)

+    In the first argument of `Just', namely rp'

+    In the expression: Just rp'

diff --git a/testsuite/tests/typecheck/should_fail/mc19.stderr b/testsuite/tests/typecheck/should_fail/mc19.stderr
index f77da6fe4b..b75e90a30d 100644
--- a/testsuite/tests/typecheck/should_fail/mc19.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc19.stderr
@@ -1,7 +1,9 @@
-
-mc19.hs:10:31:
-    Occurs check: cannot construct the infinite type: a0 = [a0]
-    Expected type: [a] -> [a]
-      Actual type: [a0] -> [[a0]]
-    In the expression: inits
-    In a stmt of a monad comprehension: then inits
+

+mc19.hs:10:31:

+    Couldn't match type `a' with `[a]'

+      `a' is a rigid type variable bound by

+          a type expected by the context: [a] -> [a] at mc19.hs:10:26

+    Expected type: [a] -> [a]

+      Actual type: [a] -> [[a]]

+    In the expression: inits

+    In a stmt of a monad comprehension: then inits

diff --git a/testsuite/tests/typecheck/should_fail/mc21.stderr b/testsuite/tests/typecheck/should_fail/mc21.stderr
index c712b4b4be..1e958c83d2 100644
--- a/testsuite/tests/typecheck/should_fail/mc21.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc21.stderr
@@ -1,9 +1,9 @@
-
-mc21.hs:12:26:
-    Couldn't match type `a' with `[a]'
-      `a' is a rigid type variable bound by
-          a type expected by the context: [a] -> [[a]] at mc21.hs:12:9
-    Expected type: [a] -> [[a]]
-      Actual type: [[a]] -> [[a]]
-    In the return type of a call of `take'
-    In the expression: take 5
+

+mc21.hs:12:26:

+    Couldn't match type `a' with `[a]'

+      `a' is a rigid type variable bound by

+          a type expected by the context: [a] -> [[a]] at mc21.hs:12:9

+    Expected type: [a] -> [[a]]

+      Actual type: [a] -> [a]

+    In the return type of a call of `take'

+    In the expression: take 5

diff --git a/testsuite/tests/typecheck/should_fail/mc22.stderr b/testsuite/tests/typecheck/should_fail/mc22.stderr
index 943b7624f0..57d9a01835 100644
--- a/testsuite/tests/typecheck/should_fail/mc22.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc22.stderr
@@ -1,9 +1,9 @@
-
-mc22.hs:10:26:
-    Couldn't match type `a' with `t0 a'
-      `a' is a rigid type variable bound by
-          a type expected by the context: [a] -> [t0 a] at mc22.hs:10:9
-    Expected type: [a] -> [t0 a]
-      Actual type: [t0 a] -> [t0 a]
-    In the return type of a call of `take'
-    In the expression: take 5
+

+mc22.hs:10:26:

+    Couldn't match type `a' with `t0 a'

+      `a' is a rigid type variable bound by

+          a type expected by the context: [a] -> [t0 a] at mc22.hs:10:9

+    Expected type: [a] -> [t0 a]

+      Actual type: [a] -> [a]

+    In the return type of a call of `take'

+    In the expression: take 5

diff --git a/testsuite/tests/typecheck/should_fail/tcfail065.stderr b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
index da855d3e6f..0621cd74d9 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail065.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
@@ -1,12 +1,11 @@
 

-tcfail065.hs:29:18:

+tcfail065.hs:29:20:

     Couldn't match type `x1' with `x'

       `x1' is a rigid type variable bound by

            the type signature for setX :: x1 -> X x -> X x

            at tcfail065.hs:29:3

       `x' is a rigid type variable bound by

           the instance declaration at tcfail065.hs:28:18

-    Expected type: X x1

-      Actual type: X x

-    In the return type of a call of `X'

+    In the first argument of `X', namely `x'

     In the expression: X x

+    In an equation for `setX': setX x (X _) = X x

diff --git a/testsuite/tests/typecheck/should_fail/tcfail068.stderr b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
index 52adc6c582..286d0e8e79 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail068.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
@@ -1,24 +1,24 @@
 

 tcfail068.hs:14:9:

-    Could not deduce (s ~ s1)

+    Could not deduce (s1 ~ s)

     from the context (Constructed a)

       bound by the type signature for

                  itgen :: Constructed a => (Int, Int) -> a -> IndTree s a

       at tcfail068.hs:(12,1)-(14,31)

+      `s1' is a rigid type variable bound by

+           a type expected by the context: GHC.ST.ST s1 (IndTree s a)

+           at tcfail068.hs:13:9

       `s' is a rigid type variable bound by

           the type signature for

             itgen :: Constructed a => (Int, Int) -> a -> IndTree s a

           at tcfail068.hs:12:1

-      `s1' is a rigid type variable bound by

-           a type expected by the context: GHC.ST.ST s1 (IndTree s a)

-           at tcfail068.hs:13:9

-    Expected type: GHC.ST.ST s1 (IndTree s a)

+    Expected type: GHC.ST.ST s (IndTree s1 a)

       Actual type: GHC.ST.ST s (STArray s (Int, Int) a)

     In the return type of a call of `newSTArray'

     In the first argument of `runST', namely

       `(newSTArray ((1, 1), n) x)'

 

-tcfail068.hs:20:9:

+tcfail068.hs:19:21:

     Could not deduce (s ~ s1)

     from the context (Constructed a)

       bound by the type signature for

@@ -33,11 +33,10 @@ tcfail068.hs:20:9:
       `s1' is a rigid type variable bound by

            a type expected by the context: GHC.ST.ST s1 (IndTree s a)

            at tcfail068.hs:18:9

-    Expected type: GHC.ST.ST s1 ()

-      Actual type: GHC.ST.ST s ()

-    In the return type of a call of `writeSTArray'

-    In the first argument of `(>>)', namely

-      `writeSTArray arr i (f val)'

+    Expected type: STArray s1 (Int, Int) a

+      Actual type: IndTree s a

+    In the first argument of `readSTArray', namely `arr'

+    In the first argument of `(>>=)', namely `readSTArray arr i'

 

 tcfail068.hs:24:35:

     Could not deduce (s ~ s1)

diff --git a/testsuite/tests/typecheck/should_fail/tcfail103.stderr b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
index 17fea5cada..2602859db4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail103.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
@@ -1,11 +1,11 @@
 

-tcfail103.hs:15:13:

+tcfail103.hs:15:23:

     Couldn't match type `t' with `s'

       `t' is a rigid type variable bound by

           the type signature for f :: ST t Int at tcfail103.hs:11:1

       `s' is a rigid type variable bound by

           the type signature for g :: ST s Int at tcfail103.hs:15:9

-    Expected type: ST s Int

-      Actual type: ST t Int

-    In the return type of a call of `readSTRef'

+    Expected type: STRef s Int

+      Actual type: STRef t Int

+    In the first argument of `readSTRef', namely `v'

     In the expression: readSTRef v

diff --git a/testsuite/tests/typecheck/should_fail/tcfail174.stderr b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
index de8bb6004d..b9bdb0a487 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail174.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
@@ -1,23 +1,23 @@
-
-tcfail174.hs:9:10:
-    Couldn't match expected type `forall a. a -> a'
-                with actual type `a0 -> a0'
-    In the first argument of `Base', namely `id'
-    In the expression: Base id
-    In an equation for `g': g = Base id
-
-tcfail174.hs:13:14:
-    Couldn't match expected type `forall x. x -> a0'
-                with actual type `forall a. a -> a'
-    Expected type: Capture (forall x. x -> a0)
-      Actual type: Capture (forall a. a -> a)
-    In the first argument of `Capture', namely `g'
-    In the expression: Capture g
-
-tcfail174.hs:16:14:
-    Couldn't match expected type `forall x. x -> a0'
-                with actual type `forall a. a -> a'
-    Expected type: Capture (forall x. x -> a0)
-      Actual type: Capture (forall a. a -> a)
-    In the first argument of `Capture', namely `g'
-    In the expression: Capture g
+

+tcfail174.hs:9:10:

+    Couldn't match expected type `forall a. a -> a'

+                with actual type `a0 -> a0'

+    In the first argument of `Base', namely `id'

+    In the expression: Base id

+    In an equation for `g': g = Base id

+

+tcfail174.hs:13:14:

+    Couldn't match expected type `forall x. x -> a0'

+                with actual type `forall a. a -> a'

+    Expected type: Capture (forall x. x -> a0)

+      Actual type: Capture (forall a. a -> a)

+    In the first argument of `Capture', namely `g'

+    In the expression: Capture g

+

+tcfail174.hs:16:14:

+    Couldn't match expected type `forall x. x -> b'

+                with actual type `forall a. a -> a'

+    Expected type: Capture (forall x. x -> b)

+      Actual type: Capture (forall a. a -> a)

+    In the first argument of `Capture', namely `g'

+    In the expression: Capture g

diff --git a/testsuite/tests/typecheck/should_fail/tcfail179.stderr b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
index 48f5e26d78..6d723db452 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail179.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
@@ -1,14 +1,13 @@
 

-tcfail179.hs:14:37:

-    Couldn't match type `s' with `x'

-      `s' is a rigid type variable bound by

-          the type signature for run :: T s -> Int at tcfail179.hs:13:1

+tcfail179.hs:14:39:

+    Couldn't match type `x' with `s'

       `x' is a rigid type variable bound by

           a pattern with constructor

             T :: forall s x. (s -> (x -> s) -> (x, s, Int)) -> T s,

           in a case alternative

           at tcfail179.hs:14:14

-    Expected type: (s, x, Int)

-      Actual type: (x, s, Int)

-    In the return type of a call of `g'

+      `s' is a rigid type variable bound by

+          the type signature for run :: T s -> Int at tcfail179.hs:13:1

+    In the first argument of `g', namely `x'

     In the expression: g x id

+    In a pattern binding: (x, _, b) = g x id

diff --git a/testsuite/tests/typecheck/should_fail/tcfail191.stderr b/testsuite/tests/typecheck/should_fail/tcfail191.stderr
index 178eebf7ff..f69bd2c263 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail191.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail191.stderr
@@ -1,9 +1,9 @@
-
-tcfail191.hs:11:26:
-    Couldn't match type `a' with `[a]'
-      `a' is a rigid type variable bound by
-          a type expected by the context: [a] -> [[a]] at tcfail191.hs:11:9
-    Expected type: [a] -> [[a]]
-      Actual type: [[a]] -> [[a]]
-    In the return type of a call of `take'
-    In the expression: take 5
+

+tcfail191.hs:11:26:

+    Couldn't match type `a' with `[a]'

+      `a' is a rigid type variable bound by

+          a type expected by the context: [a] -> [[a]] at tcfail191.hs:11:9

+    Expected type: [a] -> [[a]]

+      Actual type: [a] -> [a]

+    In the return type of a call of `take'

+    In the expression: take 5

diff --git a/testsuite/tests/typecheck/should_fail/tcfail192.stderr b/testsuite/tests/typecheck/should_fail/tcfail192.stderr
index a957fba52a..097c02fab5 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail192.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail192.stderr
@@ -14,6 +14,6 @@ tcfail192.hs:10:26:
       `a' is a rigid type variable bound by

           a type expected by the context: [a] -> [[a]] at tcfail192.hs:10:9

     Expected type: [a] -> [[a]]

-      Actual type: [[a]] -> [[a]]

+      Actual type: [a] -> [a]

     In the return type of a call of `take'

     In the expression: take 5

diff --git a/testsuite/tests/typecheck/should_fail/tcfail193.stderr b/testsuite/tests/typecheck/should_fail/tcfail193.stderr
index f19720f796..988810e2f8 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail193.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail193.stderr
@@ -1,7 +1,9 @@
-
-tcfail193.hs:10:31:
-    Occurs check: cannot construct the infinite type: a0 = [a0]
-    Expected type: [a] -> [a]
-      Actual type: [a0] -> [[a0]]
-    In the expression: inits
-    In a stmt of a list comprehension: then inits
+

+tcfail193.hs:10:31:

+    Couldn't match type `a' with `[a]'

+      `a' is a rigid type variable bound by

+          a type expected by the context: [a] -> [a] at tcfail193.hs:10:26

+    Expected type: [a] -> [a]

+      Actual type: [a] -> [[a]]

+    In the expression: inits

+    In a stmt of a list comprehension: then inits

diff --git a/testsuite/tests/typecheck/should_fail/tcfail206.stderr b/testsuite/tests/typecheck/should_fail/tcfail206.stderr
index fb812f1cbf..f469475b9f 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail206.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail206.stderr
@@ -19,7 +19,7 @@ tcfail206.hs:11:5:
       `a' is a rigid type variable bound by

           the type signature for c :: a -> (a, Bool) at tcfail206.hs:11:1

     Expected type: a -> (a, Bool)

-      Actual type: Bool -> (Bool, Bool)

+      Actual type: a -> (a, a)

     In the expression: (True || False,)

     In an equation for `c': c = (True || False,)