Error message wibbles

Almost all are re-orderings of relevant-binding output

       Relevant bindings include
  +      m :: Map (a, b) elt (bound at T3169.hs:12:17)
  +      b :: b (bound at T3169.hs:12:13)
         lookup :: (a, b) -> Map (a, b) elt -> Maybe elt
           (bound at T3169.hs:12:3)
  -      b :: b (bound at T3169.hs:12:13)
  -      m :: Map (a, b) elt (bound at T3169.hs:12:17)

5 files changed, 23 insertions, 39 deletions

diff --git a/testsuite/tests/typecheck/should_compile/FD2.stderr b/testsuite/tests/typecheck/should_compile/FD2.stderr
index cd75dabf64..679f05ddeb 100644
--- a/testsuite/tests/typecheck/should_compile/FD2.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD2.stderr
@@ -21,10 +21,10 @@ FD2.hs:26:34:
              mf :: Elem a e1 => e1 -> Maybe e1 -> Maybe e1
            at FD2.hs:24:18
     Relevant bindings include
-      foldr1 :: (e -> e -> e) -> a -> e (bound at FD2.hs:22:3)
-      f :: e -> e -> e (bound at FD2.hs:22:10)
-      mf :: e1 -> Maybe e1 -> Maybe e1 (bound at FD2.hs:25:12)
-      x :: e1 (bound at FD2.hs:26:15)
       y :: e1 (bound at FD2.hs:26:23)
+      x :: e1 (bound at FD2.hs:26:15)
+      mf :: e1 -> Maybe e1 -> Maybe e1 (bound at FD2.hs:25:12)
+      f :: e -> e -> e (bound at FD2.hs:22:10)
+      foldr1 :: (e -> e -> e) -> a -> e (bound at FD2.hs:22:3)
     In the first argument of ‛Just’, namely ‛(f x y)’
     In the expression: Just (f x y)
diff --git a/testsuite/tests/typecheck/should_compile/T2494.stderr b/testsuite/tests/typecheck/should_compile/T2494.stderr
index 370290df82..7f1a2b0ff4 100644
--- a/testsuite/tests/typecheck/should_compile/T2494.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2494.stderr
@@ -8,11 +8,11 @@ T2494.hs:15:14:
     Expected type: Maybe (m a) -> Maybe (m a)
       Actual type: Maybe (m b) -> Maybe (m b)
     Relevant bindings include
-      x :: Maybe a (bound at T2494.hs:14:65)
-      g :: forall (m :: * -> *). Monad m => Maybe (m b) -> Maybe (m b)
-        (bound at T2494.hs:14:11)
       f :: forall (m :: * -> *). Monad m => Maybe (m a) -> Maybe (m a)
         (bound at T2494.hs:13:11)
+      g :: forall (m :: * -> *). Monad m => Maybe (m b) -> Maybe (m b)
+        (bound at T2494.hs:14:11)
+      x :: Maybe a (bound at T2494.hs:14:65)
     In the first argument of ‛foo’, namely ‛g’
     In the second argument of ‛foo’, namely ‛(foo g x)’
 
@@ -25,10 +25,10 @@ T2494.hs:15:30:
     Expected type: Maybe (m a) -> Maybe (m a)
       Actual type: Maybe (m b) -> Maybe (m b)
     Relevant bindings include
-      x :: Maybe a (bound at T2494.hs:14:65)
-      g :: forall (m :: * -> *). Monad m => Maybe (m b) -> Maybe (m b)
-        (bound at T2494.hs:14:11)
       f :: forall (m :: * -> *). Monad m => Maybe (m a) -> Maybe (m a)
         (bound at T2494.hs:13:11)
+      g :: forall (m :: * -> *). Monad m => Maybe (m b) -> Maybe (m b)
+        (bound at T2494.hs:14:11)
+      x :: Maybe a (bound at T2494.hs:14:65)
     In the second argument of ‛(.)’, namely ‛g’
     In the first argument of ‛foo’, namely ‛(f . g)’
diff --git a/testsuite/tests/typecheck/should_compile/holes.stderr b/testsuite/tests/typecheck/should_compile/holes.stderr
index 58d89598bf..953982e095 100644
--- a/testsuite/tests/typecheck/should_compile/holes.stderr
+++ b/testsuite/tests/typecheck/should_compile/holes.stderr
@@ -3,29 +3,21 @@ holes.hs:5:5: Warning:
     Found hole ‛_’ with type: t
     Where: ‛t’ is a rigid type variable bound by
                the inferred type of f :: t at holes.hs:5:1
-    Relevant bindings include
-      z :: forall a. [a] -> [a] (bound at holes.hs:13:1)
-      h :: [Char] (bound at holes.hs:10:1)
-      g :: Int -> Char (bound at holes.hs:8:1)
-      f :: t (bound at holes.hs:5:1)
+    Relevant bindings include f :: t (bound at holes.hs:5:1)
     In the expression: _
     In an equation for ‛f’: f = _
 
 holes.hs:8:7: Warning:
     Found hole ‛_’ with type: Char
     Relevant bindings include
-      z :: forall a. [a] -> [a] (bound at holes.hs:13:1)
-      h :: [Char] (bound at holes.hs:10:1)
-      g :: Int -> Char (bound at holes.hs:8:1)
       x :: Int (bound at holes.hs:8:3)
+      g :: Int -> Char (bound at holes.hs:8:1)
     In the expression: _
     In an equation for ‛g’: g x = _
 
 holes.hs:10:5: Warning:
     Found hole ‛_’ with type: [Char]
-    Relevant bindings include
-      z :: forall a. [a] -> [a] (bound at holes.hs:13:1)
-      h :: [Char] (bound at holes.hs:10:1)
+    Relevant bindings include h :: [Char] (bound at holes.hs:10:1)
     In the first argument of ‛(++)’, namely ‛_’
     In the expression: _ ++ "a"
     In an equation for ‛h’: h = _ ++ "a"
@@ -34,8 +26,8 @@ holes.hs:13:15: Warning:
     Found hole ‛_’ with type: b0
     Where: ‛b0’ is an ambiguous type variable
     Relevant bindings include
-      z :: [a] -> [a] (bound at holes.hs:13:1)
       y :: [a] (bound at holes.hs:13:3)
+      z :: [a] -> [a] (bound at holes.hs:13:1)
     In the second argument of ‛const’, namely ‛_’
     In the expression: const y _
     In an equation for ‛z’: z y = const y _
diff --git a/testsuite/tests/typecheck/should_compile/holes3.stderr b/testsuite/tests/typecheck/should_compile/holes3.stderr
index dfe60315ae..c4666ec3a4 100644
--- a/testsuite/tests/typecheck/should_compile/holes3.stderr
+++ b/testsuite/tests/typecheck/should_compile/holes3.stderr
@@ -3,29 +3,21 @@ holes3.hs:5:5:
     Found hole ‛_’ with type: t
     Where: ‛t’ is a rigid type variable bound by
                the inferred type of f :: t at holes3.hs:5:1
-    Relevant bindings include
-      z :: forall a. [a] -> [a] (bound at holes3.hs:13:1)
-      h :: [Char] (bound at holes3.hs:10:1)
-      g :: Int -> Char (bound at holes3.hs:8:1)
-      f :: t (bound at holes3.hs:5:1)
+    Relevant bindings include f :: t (bound at holes3.hs:5:1)
     In the expression: _
     In an equation for ‛f’: f = _
 
 holes3.hs:8:7:
     Found hole ‛_gr’ with type: Char
     Relevant bindings include
-      z :: forall a. [a] -> [a] (bound at holes3.hs:13:1)
-      h :: [Char] (bound at holes3.hs:10:1)
-      g :: Int -> Char (bound at holes3.hs:8:1)
       x :: Int (bound at holes3.hs:8:3)
+      g :: Int -> Char (bound at holes3.hs:8:1)
     In the expression: _gr
     In an equation for ‛g’: g x = _gr
 
 holes3.hs:10:5:
     Found hole ‛_aa’ with type: [Char]
-    Relevant bindings include
-      z :: forall a. [a] -> [a] (bound at holes3.hs:13:1)
-      h :: [Char] (bound at holes3.hs:10:1)
+    Relevant bindings include h :: [Char] (bound at holes3.hs:10:1)
     In the first argument of ‛(++)’, namely ‛_aa’
     In the expression: _aa ++ "a"
     In an equation for ‛h’: h = _aa ++ "a"
@@ -34,8 +26,8 @@ holes3.hs:13:15:
     Found hole ‛_x’ with type: b0
     Where: ‛b0’ is an ambiguous type variable
     Relevant bindings include
-      z :: [a] -> [a] (bound at holes3.hs:13:1)
       y :: [a] (bound at holes3.hs:13:3)
+      z :: [a] -> [a] (bound at holes3.hs:13:1)
     In the second argument of ‛const’, namely ‛_x’
     In the expression: const y _x
     In an equation for ‛z’: z y = const y _x
diff --git a/testsuite/tests/typecheck/should_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index 9284620f9e..b63aa997ce 100644
--- a/testsuite/tests/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
@@ -13,10 +13,10 @@ tc141.hs:11:31:
       an expression type signature: a1
       at tc141.hs:11:31-34
     Relevant bindings include
-      f :: (a, a) -> (t, a) (bound at tc141.hs:11:1)
-      x :: (a, a) (bound at tc141.hs:11:3)
-      q :: a (bound at tc141.hs:11:17)
       p :: a (bound at tc141.hs:11:12)
+      q :: a (bound at tc141.hs:11:17)
+      x :: (a, a) (bound at tc141.hs:11:3)
+      f :: (a, a) -> (t, a) (bound at tc141.hs:11:1)
     In the expression: q :: a
     In the expression: (q :: a, p)
 
@@ -39,8 +39,8 @@ tc141.hs:15:18:
       the type signature for v :: a2
       at tc141.hs:14:19
     Relevant bindings include
-      g :: a -> t -> a1 (bound at tc141.hs:13:1)
-      b :: t (bound at tc141.hs:13:5)
       v :: a2 (bound at tc141.hs:15:14)
+      b :: t (bound at tc141.hs:13:5)
+      g :: a -> t -> a1 (bound at tc141.hs:13:1)
     In the expression: b
     In an equation for ‛v’: v = b