Use diagnostic infrastructure in GHC.Tc.Errors

41 files changed, 160 insertions, 127 deletions

diff --git a/testsuite/tests/rename/prog002/rename.prog002.stderr b/testsuite/tests/rename/prog002/rename.prog002.stderr
index 01ab86946e..9fe478288f 100644
--- a/testsuite/tests/rename/prog002/rename.prog002.stderr
+++ b/testsuite/tests/rename/prog002/rename.prog002.stderr
@@ -1,5 +1,6 @@
 
 rnfail037.hs:8:7: error:
     Not in scope: data constructor ‘Rn037Help.C’
-    Perhaps you want to remove ‘C’ from the explicit hiding list
-    in the import of ‘Rn037Help’ (rnfail037.hs:4:1-28).
+    Suggested fix:
+      Perhaps you want to remove ‘C’ from the explicit hiding list
+      in the import of ‘Rn037Help’ (rnfail037.hs:4:1-28).
diff --git a/testsuite/tests/rename/should_compile/T9778.stderr b/testsuite/tests/rename/should_compile/T9778.stderr
index 81c69fdb8e..9fcc9ece34 100644
--- a/testsuite/tests/rename/should_compile/T9778.stderr
+++ b/testsuite/tests/rename/should_compile/T9778.stderr
@@ -1,4 +1,4 @@
 
 T9778.hs:8:10: warning: [-Wunticked-promoted-constructors (in -Wall)]
     Unticked promoted constructor: ‘A’.
-    Use ‘'A’ instead of ‘A’.
+    Suggested fix: Use ‘'A’ instead of ‘A’.
diff --git a/testsuite/tests/rename/should_fail/T10618.stderr b/testsuite/tests/rename/should_fail/T10618.stderr
index cba5e47aff..629e93727b 100644
--- a/testsuite/tests/rename/should_fail/T10618.stderr
+++ b/testsuite/tests/rename/should_fail/T10618.stderr
@@ -1,6 +1,7 @@
 
 T10618.hs:3:22: error:
-    • Variable not in scope: (<|>) :: Maybe (Maybe a0) -> Maybe a1 -> t
-    • Perhaps you meant one of these:
+    Variable not in scope: (<|>) :: Maybe (Maybe a0) -> Maybe a1 -> t
+    Suggested fix:
+      Perhaps use one of these:
         ‘<>’ (imported from Prelude), ‘<$>’ (imported from Prelude),
         ‘<*>’ (imported from Prelude)
diff --git a/testsuite/tests/rename/should_fail/T10781.stderr b/testsuite/tests/rename/should_fail/T10781.stderr
index d86f0d1beb..3a5ccde99f 100644
--- a/testsuite/tests/rename/should_fail/T10781.stderr
+++ b/testsuite/tests/rename/should_fail/T10781.stderr
@@ -1,4 +1,4 @@
 
 T10781.hs:12:5: error:
     Not in scope: ‘Foo._name’
-    No module named ‘Foo’ is imported.
+    NB: no module named ‘Foo’ is imported.
diff --git a/testsuite/tests/rename/should_fail/T11071.stderr b/testsuite/tests/rename/should_fail/T11071.stderr
index 0e77fae7de..4faad680ec 100644
--- a/testsuite/tests/rename/should_fail/T11071.stderr
+++ b/testsuite/tests/rename/should_fail/T11071.stderr
@@ -1,53 +1,60 @@
 
 T11071.hs:19:12: error:
     Not in scope: ‘NoSuchModule.foo’
-    No module named ‘NoSuchModule’ is imported.
+    NB: no module named ‘NoSuchModule’ is imported.
 
 T11071.hs:20:12: error:
     Not in scope: ‘Data.List.foobar’
-    Module ‘Data.List’ does not export ‘foobar’.
+    NB: the module ‘Data.List’ does not export ‘foobar’.
 
 T11071.hs:21:12: error:
     Not in scope: ‘M.foobar’
-    Neither ‘Data.IntMap’ nor ‘Data.Map’ exports ‘foobar’.
+    NB: neither ‘Data.IntMap’ nor ‘Data.Map’ export ‘foobar’.
 
 T11071.hs:22:12: error:
     Not in scope: ‘M'.foobar’
-    Neither ‘System.IO’, ‘Data.IntMap’ nor ‘Data.Map’ exports ‘foobar’.
+    NB: neither ‘System.IO’,
+                ‘Data.IntMap’ nor ‘Data.Map’ export ‘foobar’.
 
 T11071.hs:23:12: error:
     Not in scope: ‘Data.List.sort’
-    Perhaps you want to add ‘sort’ to the import list in the import of
-    ‘Data.List’ (T11071.hs:3:1-24).
+    Suggested fix:
+      Perhaps you want to add ‘sort’ to the import list in the import of
+      ‘Data.List’ (T11071.hs:3:1-24).
 
 T11071.hs:24:12: error:
     Not in scope: ‘Data.List.unlines’
-    Perhaps you meant ‘Data.List.lines’ (imported from Data.List)
-    Perhaps you want to add ‘unlines’ to the import list
-    in the import of ‘Data.List’ (T11071.hs:3:1-24).
+    Suggested fixes:
+      • Perhaps use ‘Data.List.lines’ (imported from Data.List)
+      • Perhaps you want to add ‘unlines’ to the import list
+        in the import of ‘Data.List’ (T11071.hs:3:1-24).
 
 T11071.hs:25:12: error:
     Not in scope: ‘M.size’
-    Perhaps you want to add ‘size’ to one of these import lists:
-      ‘Data.IntMap’ (T11071.hs:5:1-36)
-      ‘Data.Map’ (T11071.hs:4:1-33)
+    Suggested fix:
+      Perhaps you want to add ‘size’ to one of these import lists:
+        ‘Data.IntMap’ (T11071.hs:5:1-36)
+        ‘Data.Map’ (T11071.hs:4:1-33)
 
 T11071.hs:26:12: error:
     Not in scope: ‘M.valid’
-    Perhaps you meant one of these:
-      ‘M'.valid’ (imported from Data.Map),
-      ‘M'.valid’ (imported from Data.Map)
-    Perhaps you want to add ‘valid’ to the import list in the import of
-    ‘Data.Map’ (T11071.hs:4:1-33).
+    Suggested fixes:
+      • Perhaps use one of these:
+          ‘M'.valid’ (imported from Data.Map),
+          ‘M'.valid’ (imported from Data.Map)
+      • Perhaps you want to add ‘valid’ to the import list
+        in the import of ‘Data.Map’ (T11071.hs:4:1-33).
 
 T11071.hs:27:12: error:
     Not in scope: data constructor ‘Ord.Down’
-    Perhaps you want to remove ‘Down’ from the explicit hiding list
-    in the import of ‘Data.Ord’ (T11071.hs:8:1-46).
+    Suggested fix:
+      Perhaps you want to remove ‘Down’ from the explicit hiding list
+      in the import of ‘Data.Ord’ (T11071.hs:8:1-46).
 
 T11071.hs:28:12: error:
     Not in scope: ‘M'.size’
-    Perhaps you want to remove ‘size’ from the hiding clauses
-    in one of these imports:
-      ‘Data.IntMap’ (T11071.hs:12:1-48)
-      ‘Data.Map’ (T11071.hs:10:1-53)
+    Suggested fix:
+      Perhaps you want to remove ‘size’ from the hiding clauses
+      in one of these imports:
+        ‘Data.IntMap’ (T11071.hs:12:1-48)
+        ‘Data.Map’ (T11071.hs:10:1-53)
diff --git a/testsuite/tests/rename/should_fail/T11071a.stderr b/testsuite/tests/rename/should_fail/T11071a.stderr
index 853a79d3d7..5a2a9e92fa 100644
--- a/testsuite/tests/rename/should_fail/T11071a.stderr
+++ b/testsuite/tests/rename/should_fail/T11071a.stderr
@@ -1,26 +1,30 @@
 
 T11071a.hs:12:12: error:
-    • Variable not in scope: intersperse
-    • Perhaps you want to add ‘intersperse’ to the import list
+    Variable not in scope: intersperse
+    Suggested fix:
+      Perhaps you want to add ‘intersperse’ to the import list
       in the import of ‘Data.List’ (T11071a.hs:3:1-24).
 
 T11071a.hs:13:12: error:
-    • Variable not in scope: foldl'
-    • Perhaps you meant one of these:
-        ‘foldl’ (imported from Prelude), ‘foldl1’ (imported from Prelude),
-        ‘foldr’ (imported from Prelude)
-      Perhaps you want to add ‘foldl'’ to one of these import lists:
-        ‘Data.List’ (T11071a.hs:3:1-24)
-        ‘Data.IntMap’ (T11071a.hs:4:1-21)
+    Variable not in scope: foldl'
+    Suggested fixes:
+      • Perhaps use one of these:
+          ‘foldl’ (imported from Prelude), ‘foldl1’ (imported from Prelude),
+          ‘foldr’ (imported from Prelude)
+      • Perhaps you want to add ‘foldl'’ to one of these import lists:
+          ‘Data.List’ (T11071a.hs:3:1-24)
+          ‘Data.IntMap’ (T11071a.hs:4:1-21)
 
 T11071a.hs:14:12: error:
-    • Data constructor not in scope: Down
-    • Perhaps you want to remove ‘Down’ from the explicit hiding list
+    Data constructor not in scope: Down
+    Suggested fix:
+      Perhaps you want to remove ‘Down’ from the explicit hiding list
       in the import of ‘Data.Ord’ (T11071a.hs:5:1-29).
 
 T11071a.hs:15:12: error:
-    • Data constructor not in scope: True
-    • Perhaps you want to remove ‘True’ from the explicit hiding list
+    Data constructor not in scope: True
+    Suggested fix:
+      Perhaps you want to remove ‘True’ from the explicit hiding list
       in the import of ‘Prelude’ (T11071a.hs:6:1-28).
 
 T11071a.hs:16:12: error: Variable not in scope: foobar
diff --git a/testsuite/tests/rename/should_fail/T12681.stderr b/testsuite/tests/rename/should_fail/T12681.stderr
index 547cf4c01c..9f57265bcd 100644
--- a/testsuite/tests/rename/should_fail/T12681.stderr
+++ b/testsuite/tests/rename/should_fail/T12681.stderr
@@ -1,4 +1,4 @@
 
 T12681.hs:4:17: error:
     Not in scope: ‘a’
-    Perhaps you meant ‘T12681a.a’ (imported from T12681a)
+    Suggested fix: Perhaps use ‘T12681a.a’ (imported from T12681a)
diff --git a/testsuite/tests/rename/should_fail/T13568.stderr b/testsuite/tests/rename/should_fail/T13568.stderr
index 63ee18409a..b0fce190e0 100644
--- a/testsuite/tests/rename/should_fail/T13568.stderr
+++ b/testsuite/tests/rename/should_fail/T13568.stderr
@@ -1,4 +1,6 @@
 
 T13568.hs:7:8: error:
     Not in scope: type constructor or class ‘A’
-    A data constructor of that name is in scope; did you mean DataKinds?
+    Suggested fix:
+      Perhaps you intended to use DataKinds
+      to refer to the data constructor of that name?
diff --git a/testsuite/tests/rename/should_fail/T14225.stderr b/testsuite/tests/rename/should_fail/T14225.stderr
index f54e463e53..c3ea46a789 100644
--- a/testsuite/tests/rename/should_fail/T14225.stderr
+++ b/testsuite/tests/rename/should_fail/T14225.stderr
@@ -1,3 +1,4 @@
+
 <interactive>:2:1: error:
     Not in scope: ‘M.fromJusr’
-    Perhaps you meant ‘M.fromJust’ (imported from Data.Maybe)
+    Suggested fix: Perhaps use ‘M.fromJust’ (imported from Data.Maybe)
diff --git a/testsuite/tests/rename/should_fail/T15539.stderr b/testsuite/tests/rename/should_fail/T15539.stderr
index 9ac202f420..c3c1653b51 100644
--- a/testsuite/tests/rename/should_fail/T15539.stderr
+++ b/testsuite/tests/rename/should_fail/T15539.stderr
@@ -1,4 +1,5 @@
 
 T15539.hs:6:13: error:
-    • Variable not in scope: baz
-    • Perhaps you meant one of these: ‘bam’ (line 17), ‘bar’ (line 15)
+    Variable not in scope: baz
+    Suggested fix:
+      Perhaps use one of these: ‘bam’ (line 17), ‘bar’ (line 15)
diff --git a/testsuite/tests/rename/should_fail/T15607.stderr b/testsuite/tests/rename/should_fail/T15607.stderr
index 4c1111eef9..2a534d2a5a 100644
--- a/testsuite/tests/rename/should_fail/T15607.stderr
+++ b/testsuite/tests/rename/should_fail/T15607.stderr
@@ -1,5 +1,6 @@
 
 T15607.hs:6:10: error:
-    • Variable not in scope: pure :: t0 -> t
-    • Perhaps you want to remove ‘pure’ from the explicit hiding list
+    Variable not in scope: pure :: t0 -> t
+    Suggested fix:
+      Perhaps you want to remove ‘pure’ from the explicit hiding list
       in the import of ‘Prelude’ (T15607.hs:4:1-36).
diff --git a/testsuite/tests/rename/should_fail/T16504.stderr b/testsuite/tests/rename/should_fail/T16504.stderr
index 2fc822d3a2..798404afc3 100644
--- a/testsuite/tests/rename/should_fail/T16504.stderr
+++ b/testsuite/tests/rename/should_fail/T16504.stderr
@@ -2,14 +2,16 @@
 T16504.hs:5:1: error:
     The type signature for ‘simpleFuntcion’
       lacks an accompanying binding
-      Perhaps you meant one of these:
+    Suggested fix:
+      Perhaps use one of these:
         ‘simpleFunction’ (Defined at T16504.hs:6:1),
         ‘simpleFunction2’ (Defined at T16504.hs:7:1)
 
 T16504.hs:11:9: error:
     The type signature for ‘anotherFunction’
       lacks an accompanying binding
-      Perhaps you meant ‘anotherFuntcion’ (Defined at T16504.hs:12:9)
+    Suggested fix:
+      Perhaps use ‘anotherFuntcion’ (Defined at T16504.hs:12:9)
 
 T16504.hs:15:1: error:
     The type signature for ‘nonexistentFuntcion’
diff --git a/testsuite/tests/rename/should_fail/T19843b.stderr b/testsuite/tests/rename/should_fail/T19843b.stderr
index 5b457440eb..6a92e26a4d 100644
--- a/testsuite/tests/rename/should_fail/T19843b.stderr
+++ b/testsuite/tests/rename/should_fail/T19843b.stderr
@@ -1,4 +1,4 @@
 
-T19843b.hs:7:6:
-    • Data constructor not in scope: Map :: (a0 -> Bool) -> t -> t0
-    • Perhaps you meant variable ‘map’ (imported from Prelude)
+T19843b.hs:7:6: error:
+    Data constructor not in scope: Map :: (a0 -> Bool) -> t -> t0
+    Suggested fix: Perhaps use variable ‘map’ (imported from Prelude)
diff --git a/testsuite/tests/rename/should_fail/T19843c.stderr b/testsuite/tests/rename/should_fail/T19843c.stderr
index 94cdadf528..d15ac772b4 100644
--- a/testsuite/tests/rename/should_fail/T19843c.stderr
+++ b/testsuite/tests/rename/should_fail/T19843c.stderr
@@ -1,4 +1,4 @@
 
 T19843c.hs:6:6: error:
     Not in scope: data constructor ‘Map.Map’
-    Module ‘Data.Map’ does not export ‘Map’.
+    NB: the module ‘Data.Map’ does not export ‘Map’.
diff --git a/testsuite/tests/rename/should_fail/T19843d.stderr b/testsuite/tests/rename/should_fail/T19843d.stderr
index a27a627005..34a5de28f0 100644
--- a/testsuite/tests/rename/should_fail/T19843d.stderr
+++ b/testsuite/tests/rename/should_fail/T19843d.stderr
@@ -1,4 +1,4 @@
 
 T19843d.hs:7:6: error:
     Not in scope: data constructor ‘Map’
-    Perhaps you meant ‘Mup’ (line 5)
+    Suggested fix: Perhaps use ‘Mup’ (line 5)
diff --git a/testsuite/tests/rename/should_fail/T19843e.stderr b/testsuite/tests/rename/should_fail/T19843e.stderr
index 890c719bd8..f5870a356e 100644
--- a/testsuite/tests/rename/should_fail/T19843e.stderr
+++ b/testsuite/tests/rename/should_fail/T19843e.stderr
@@ -1,4 +1,4 @@
 
 T19843e.hs:9:6: error:
     Not in scope: data constructor ‘Map’
-    Perhaps you meant ‘Mup’ (line 7)
+    Suggested fix: Perhaps use ‘Mup’ (line 7)
diff --git a/testsuite/tests/rename/should_fail/T19843f.stderr b/testsuite/tests/rename/should_fail/T19843f.stderr
index 903fee7849..3b73444439 100644
--- a/testsuite/tests/rename/should_fail/T19843f.stderr
+++ b/testsuite/tests/rename/should_fail/T19843f.stderr
@@ -1,8 +1,8 @@
 
 T19843f.hs:8:12: error:
     Not in scope: ‘mup’
-    Perhaps you meant ‘mop’ (line 5)
+    Suggested fix: Perhaps use ‘mop’ (line 5)
 
 T19843f.hs:10:10: error:
     Not in scope: ‘mup’
-    Perhaps you meant ‘mop’ (line 5)
+    Suggested fix: Perhaps use ‘mop’ (line 5)
diff --git a/testsuite/tests/rename/should_fail/T19843g.stderr b/testsuite/tests/rename/should_fail/T19843g.stderr
index 6d0d398bfd..f635b6c2d2 100644
--- a/testsuite/tests/rename/should_fail/T19843g.stderr
+++ b/testsuite/tests/rename/should_fail/T19843g.stderr
@@ -1,4 +1,4 @@
 
 T19843g.hs:10:12: error:
     Not in scope: ‘mup’
-    Perhaps you meant ‘mop’ (line 7)
+    Suggested fix: Perhaps use ‘mop’ (line 7)
diff --git a/testsuite/tests/rename/should_fail/T19843h.stderr b/testsuite/tests/rename/should_fail/T19843h.stderr
index 56bca0feeb..f7eeb9d5e9 100644
--- a/testsuite/tests/rename/should_fail/T19843h.stderr
+++ b/testsuite/tests/rename/should_fail/T19843h.stderr
@@ -1,34 +1,34 @@
 
-T19843h.hs:14:7:
-     No instance for (GHC.Records.HasField "mup" r4 a4)
+T19843h.hs:14:7: error:
+    • No instance for (GHC.Records.HasField "mup" r4 a4)
         arising from selecting the field ‘mup’
-      Perhaps you meant ‘mop’ (line 11)
-     In the expression: undefined.mup
+      Perhaps use ‘mop’ (line 11)
+    • In the expression: undefined.mup
       In an equation for ‘foo’: foo = undefined.mup
 
-T19843h.hs:16:7:
-     No instance for (GHC.Records.HasField "traverse" r3 a3)
+T19843h.hs:16:7: error:
+    • No instance for (GHC.Records.HasField "traverse" r3 a3)
         arising from selecting the field ‘traverse’
-     In the expression: undefined.traverse
+    • In the expression: undefined.traverse
       In an equation for ‘bar’: bar = undefined.traverse
 
-T19843h.hs:18:7:
-     No instance for (GHC.Records.HasField "getSum" r2 a2)
+T19843h.hs:18:7: error:
+    • No instance for (GHC.Records.HasField "getSum" r2 a2)
         arising from selecting the field ‘getSum’
-     In the expression: undefined.getSum
+    • In the expression: undefined.getSum
       In an equation for ‘baz’: baz = undefined.getSum
 
-T19843h.hs:20:8:
-     No instance for (GHC.Records.HasField "getAlt" r1 a1)
+T19843h.hs:20:8: error:
+    • No instance for (GHC.Records.HasField "getAlt" r1 a1)
         arising from selecting the field ‘getAlt’
-     In the expression: undefined.getAlt
+    • In the expression: undefined.getAlt
       In an equation for ‘quux’: quux = undefined.getAlt
 
-T19843h.hs:24:8:
-     No instance for (GHC.Records.HasField "getAll" r0 a0)
+T19843h.hs:24:8: error:
+    • No instance for (GHC.Records.HasField "getAll" r0 a0)
         arising from selecting the field ‘getAll’
-      Perhaps you meant ‘getAlt’ (imported from Data.Monoid)
+      Perhaps use ‘getAlt’ (imported from Data.Monoid)
       Perhaps you want to add ‘getAll’ to the import list
       in the import of ‘Data.Monoid’ (T19843h.hs:9:1-28).
-     In the expression: undefined.getAll
+    • In the expression: undefined.getAll
       In an equation for ‘quur’: quur = undefined.getAll
diff --git a/testsuite/tests/rename/should_fail/T19843i.stderr b/testsuite/tests/rename/should_fail/T19843i.stderr
index 60f671c679..f5de15281b 100644
--- a/testsuite/tests/rename/should_fail/T19843i.stderr
+++ b/testsuite/tests/rename/should_fail/T19843i.stderr
@@ -1,5 +1,6 @@
 
-T19843i.hs:5:5:
+T19843i.hs:5:5: error:
     Not in scope: ‘M.getSum’
-    Perhaps you want to add ‘getSum’ to the import list
-    in the import of ‘Data.Monoid’ (T19843i.hs:3:1-32).
+    Suggested fix:
+      Perhaps you want to add ‘getSum’ to the import list
+      in the import of ‘Data.Monoid’ (T19843i.hs:3:1-32).
diff --git a/testsuite/tests/rename/should_fail/T19843j.stderr b/testsuite/tests/rename/should_fail/T19843j.stderr
index e99a9f0a62..a0423eeb76 100644
--- a/testsuite/tests/rename/should_fail/T19843j.stderr
+++ b/testsuite/tests/rename/should_fail/T19843j.stderr
@@ -1,5 +1,6 @@
 
-T19843j.hs:5:5:
-     Variable not in scope: guard
-     Perhaps you want to add ‘guard’ to the import list
-      in the import of ‘Control.Monad’ (T19843j.hs:3:1-31).
+T19843j.hs:5:5: error:
+    Variable not in scope: guard
+    Suggested fix:
+      Perhaps you want to add ‘guard’ to the import list in the import of
+      ‘Control.Monad’ (T19843j.hs:3:1-31).
diff --git a/testsuite/tests/rename/should_fail/T19843k.stderr b/testsuite/tests/rename/should_fail/T19843k.stderr
index 08ed7d8c08..7872fdb784 100644
--- a/testsuite/tests/rename/should_fail/T19843k.stderr
+++ b/testsuite/tests/rename/should_fail/T19843k.stderr
@@ -1,4 +1,4 @@
 
-T19843k.hs:5:8:
+T19843k.hs:5:8: error:
     Not in scope: ‘M.doesn'tExist’
-    Module ‘Data.Monoid’ does not export ‘doesn'tExist’.
+    NB: the module ‘Data.Monoid’ does not export ‘doesn'tExist’.
diff --git a/testsuite/tests/rename/should_fail/T19843l.stderr b/testsuite/tests/rename/should_fail/T19843l.stderr
index d5168b2b90..094a0b43a2 100644
--- a/testsuite/tests/rename/should_fail/T19843l.stderr
+++ b/testsuite/tests/rename/should_fail/T19843l.stderr
@@ -1,4 +1,4 @@
 
-T19843l.hs:7:12:
+T19843l.hs:7:12: error:
     Not in scope: type constructor or class ‘WrongName’
-    Perhaps you meant ‘FongName’ (line 4)
+    Suggested fix: Perhaps use ‘FongName’ (line 4)
diff --git a/testsuite/tests/rename/should_fail/T19843m.stderr b/testsuite/tests/rename/should_fail/T19843m.stderr
index dd7583842a..1ec2b31925 100644
--- a/testsuite/tests/rename/should_fail/T19843m.stderr
+++ b/testsuite/tests/rename/should_fail/T19843m.stderr
@@ -1,5 +1,6 @@
 
-T19843m.hs:9:12:
+T19843m.hs:9:12: error:
     Not in scope: type constructor or class ‘WrongName’
-    Perhaps you meant one of these:
-      ‘FongName’ (line 6), data constructor ‘LongName’ (line 5)
+    Suggested fix:
+      Perhaps use one of these:
+        ‘FongName’ (line 6), data constructor ‘LongName’ (line 5)
diff --git a/testsuite/tests/rename/should_fail/T2901.stderr b/testsuite/tests/rename/should_fail/T2901.stderr
index d5a5bbda9a..eab94f2acf 100644
--- a/testsuite/tests/rename/should_fail/T2901.stderr
+++ b/testsuite/tests/rename/should_fail/T2901.stderr
@@ -1,4 +1,4 @@
 
 T2901.hs:6:5: error:
     Not in scope: data constructor ‘F.Foo’
-    No module named ‘F’ is imported.
+    NB: no module named ‘F’ is imported.
diff --git a/testsuite/tests/rename/should_fail/T2993.stderr b/testsuite/tests/rename/should_fail/T2993.stderr
index 4542ffeaf0..67dadf14bc 100644
--- a/testsuite/tests/rename/should_fail/T2993.stderr
+++ b/testsuite/tests/rename/should_fail/T2993.stderr
@@ -1,4 +1,4 @@
 
 T2993.hs:7:13: error:
-    • Variable not in scope: (<**>) :: t -> (a -> a) -> t1
-    • Perhaps you meant ‘<*>’ (imported from Prelude)
+    Variable not in scope: (<**>) :: t -> (a -> a) -> t1
+    Suggested fix: Perhaps use ‘<*>’ (imported from Prelude)
diff --git a/testsuite/tests/rename/should_fail/T495.stderr b/testsuite/tests/rename/should_fail/T495.stderr
index 0581807d70..cc637c4681 100644
--- a/testsuite/tests/rename/should_fail/T495.stderr
+++ b/testsuite/tests/rename/should_fail/T495.stderr
@@ -4,4 +4,5 @@ T495.hs:4:12: error:
 
 T495.hs:7:12: error:
     The INLINE pragma for ‘lookup’ lacks an accompanying binding
-      (The INLINE pragma must be given where ‘lookup’ is declared)
+    Suggested fix:
+      Move the INLINE pragma to the declaration site of ‘lookup’.
diff --git a/testsuite/tests/rename/should_fail/T5001b.stderr b/testsuite/tests/rename/should_fail/T5001b.stderr
index e5f7aa1d14..2544aa4dc2 100644
--- a/testsuite/tests/rename/should_fail/T5001b.stderr
+++ b/testsuite/tests/rename/should_fail/T5001b.stderr
@@ -1,4 +1,5 @@
 
 T5001b.hs:10:17: error:
     The INLINE pragma for ‘genum’ lacks an accompanying binding
-      (The INLINE pragma must be given where ‘genum’ is declared)
+    Suggested fix:
+      Move the INLINE pragma to the declaration site of ‘genum’.
diff --git a/testsuite/tests/rename/should_fail/T5372.stderr b/testsuite/tests/rename/should_fail/T5372.stderr
index d8b8e8fa56..3642362660 100644
--- a/testsuite/tests/rename/should_fail/T5372.stderr
+++ b/testsuite/tests/rename/should_fail/T5372.stderr
@@ -1,4 +1,4 @@
 
 T5372.hs:4:11: error:
     Not in scope: data constructor ‘MkS’
-    Perhaps you meant ‘T5372a.MkS’ (imported from T5372a)
+    Suggested fix: Perhaps use ‘T5372a.MkS’ (imported from T5372a)
diff --git a/testsuite/tests/rename/should_fail/T5533.stderr b/testsuite/tests/rename/should_fail/T5533.stderr
index bd5516cceb..67dbf3a93e 100644
--- a/testsuite/tests/rename/should_fail/T5533.stderr
+++ b/testsuite/tests/rename/should_fail/T5533.stderr
@@ -1,4 +1,5 @@
 
 T5533.hs:4:1: error:
     The type signature for ‘f2’ lacks an accompanying binding
-      (The type signature must be given where ‘f2’ is declared)
+    Suggested fix:
+      Move the type signature to the declaration site of ‘f2’.
diff --git a/testsuite/tests/rename/should_fail/T5657.stderr b/testsuite/tests/rename/should_fail/T5657.stderr
index 5663b900d9..28c3ba7d6c 100644
--- a/testsuite/tests/rename/should_fail/T5657.stderr
+++ b/testsuite/tests/rename/should_fail/T5657.stderr
@@ -1,7 +1,7 @@
 
 T5657.hs:3:8: error:
     Not in scope: ‘LT..’
-    No module named ‘LT’ is imported.
+    NB: no module named ‘LT’ is imported.
 
 T5657.hs:3:8: error:
     A section must be enclosed in parentheses thus: (LT.. GT)
diff --git a/testsuite/tests/rename/should_fail/T7906.stderr b/testsuite/tests/rename/should_fail/T7906.stderr
index ddcd4ff484..5a8c7cb77d 100644
--- a/testsuite/tests/rename/should_fail/T7906.stderr
+++ b/testsuite/tests/rename/should_fail/T7906.stderr
@@ -1,4 +1,5 @@
 
 T7906.hs:5:15: error:
     The INLINABLE pragma for ‘foo’ lacks an accompanying binding
-      (The INLINABLE pragma must be given where ‘foo’ is declared)
+    Suggested fix:
+      Move the INLINABLE pragma to the declaration site of ‘foo’.
diff --git a/testsuite/tests/rename/should_fail/T7937.stderr b/testsuite/tests/rename/should_fail/T7937.stderr
index 7a65b0c06e..11a2bed876 100644
--- a/testsuite/tests/rename/should_fail/T7937.stderr
+++ b/testsuite/tests/rename/should_fail/T7937.stderr
@@ -1,4 +1,4 @@
 
 T7937.hs:8:13: error:
-    • Variable not in scope: (***) :: Bool -> Bool -> t
-    • Perhaps you meant ‘**’ (imported from Prelude)
+    Variable not in scope: (***) :: Bool -> Bool -> t
+    Suggested fix: Perhaps use ‘**’ (imported from Prelude)
diff --git a/testsuite/tests/rename/should_fail/T9177.stderr b/testsuite/tests/rename/should_fail/T9177.stderr
index a1153b4fcb..215a144f06 100644
--- a/testsuite/tests/rename/should_fail/T9177.stderr
+++ b/testsuite/tests/rename/should_fail/T9177.stderr
@@ -1,11 +1,12 @@
 
 T9177.hs:4:13: error:
     Not in scope: type variable ‘int’
-    Perhaps you meant type constructor or class ‘Int’ (imported from Prelude)
+    Suggested fix:
+      Perhaps use type constructor or class ‘Int’ (imported from Prelude)
 
 T9177.hs:7:14: error:
     Not in scope: type variable ‘integerr’
-    Perhaps you meant type constructor or class ‘Integer’ (imported from Prelude)
+    Suggested fix:
+      Perhaps use type constructor or class ‘Integer’ (imported from Prelude)
 
-T9177.hs:17:6: error:
-    Not in scope: data constructor ‘Fun’
+T9177.hs:17:6: error: Not in scope: data constructor ‘Fun’
diff --git a/testsuite/tests/rename/should_fail/T9436.stderr b/testsuite/tests/rename/should_fail/T9436.stderr
index 2b9b10fb14..30a7c5f6b4 100644
--- a/testsuite/tests/rename/should_fail/T9436.stderr
+++ b/testsuite/tests/rename/should_fail/T9436.stderr
@@ -1,4 +1,4 @@
 
-T9436.hs:8:4:
+T9436.hs:8:4: error:
     Not in scope: data constructor ‘T'’
-    Perhaps you meant ‘T’ (line 5)
+    Suggested fix: Perhaps use ‘T’ (line 5)
diff --git a/testsuite/tests/rename/should_fail/rnfail022.stderr b/testsuite/tests/rename/should_fail/rnfail022.stderr
index c27e6130f9..87a1adef3f 100644
--- a/testsuite/tests/rename/should_fail/rnfail022.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail022.stderr
@@ -1,4 +1,5 @@
 
 rnfail022.hs:8:5: error:
-    • Variable not in scope: intersperse
-    • Perhaps you meant ‘L.intersperse’ (imported from Data.List)
+    Variable not in scope: intersperse
+    Suggested fix:
+      Perhaps use ‘L.intersperse’ (imported from Data.List)
diff --git a/testsuite/tests/rename/should_fail/rnfail030.stderr b/testsuite/tests/rename/should_fail/rnfail030.stderr
index 462dc5fa2c..6343062325 100644
--- a/testsuite/tests/rename/should_fail/rnfail030.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail030.stderr
@@ -1,5 +1,6 @@
 
 rnfail030.hs:2:21: error:
     Not in scope: ‘Data.List.map’
-    Perhaps you want to add ‘map’ to the import list in the import of
-    ‘Data.List’ (rnfail030.hs:3:1-19).
+    Suggested fix:
+      Perhaps you want to add ‘map’ to the import list in the import of
+      ‘Data.List’ (rnfail030.hs:3:1-19).
diff --git a/testsuite/tests/rename/should_fail/rnfail031.stderr b/testsuite/tests/rename/should_fail/rnfail031.stderr
index 95d8ea1561..1036d52bcb 100644
--- a/testsuite/tests/rename/should_fail/rnfail031.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail031.stderr
@@ -1,5 +1,6 @@
 
 rnfail031.hs:2:21: error:
     Not in scope: ‘Data.List.map’
-    Perhaps you want to add ‘map’ to the import list in the import of
-    ‘Data.List’ (rnfail031.hs:3:1-36).
+    Suggested fix:
+      Perhaps you want to add ‘map’ to the import list in the import of
+      ‘Data.List’ (rnfail031.hs:3:1-36).
diff --git a/testsuite/tests/rename/should_fail/rnfail032.stderr b/testsuite/tests/rename/should_fail/rnfail032.stderr
index 874b1746e6..febd380442 100644
--- a/testsuite/tests/rename/should_fail/rnfail032.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail032.stderr
@@ -1,9 +1,10 @@
 
 rnfail032.hs:2:21: error:
     Not in scope: ‘Data.List.map’
-    Perhaps you meant one of these:
-      ‘Data.List.zip’ (imported from Data.List),
-      ‘Data.List.or’ (imported from Data.List),
-      ‘Data.List.all’ (imported from Data.List)
-    Perhaps you want to remove ‘map’ from the explicit hiding list
-    in the import of ‘Data.List’ (rnfail032.hs:3:1-41).
+    Suggested fixes:
+      • Perhaps use one of these:
+          ‘Data.List.zip’ (imported from Data.List),
+          ‘Data.List.or’ (imported from Data.List),
+          ‘Data.List.all’ (imported from Data.List)
+      • Perhaps you want to remove ‘map’ from the explicit hiding list
+        in the import of ‘Data.List’ (rnfail032.hs:3:1-41).
diff --git a/testsuite/tests/rename/should_fail/rnfail033.stderr b/testsuite/tests/rename/should_fail/rnfail033.stderr
index a445fd7293..d9fbc22a1c 100644
--- a/testsuite/tests/rename/should_fail/rnfail033.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail033.stderr
@@ -1,9 +1,10 @@
 
 rnfail033.hs:2:21: error:
     Not in scope: ‘Data.List.map’
-    Perhaps you meant one of these:
-      ‘Data.List.zip’ (imported from Data.List),
-      ‘Data.List.or’ (imported from Data.List),
-      ‘Data.List.all’ (imported from Data.List)
-    Perhaps you want to remove ‘map’ from the explicit hiding list
-    in the import of ‘Data.List’ (rnfail033.hs:3:1-31).
+    Suggested fixes:
+      • Perhaps use one of these:
+          ‘Data.List.zip’ (imported from Data.List),
+          ‘Data.List.or’ (imported from Data.List),
+          ‘Data.List.all’ (imported from Data.List)
+      • Perhaps you want to remove ‘map’ from the explicit hiding list
+        in the import of ‘Data.List’ (rnfail033.hs:3:1-31).
diff --git a/testsuite/tests/rename/should_fail/rnfail034.stderr b/testsuite/tests/rename/should_fail/rnfail034.stderr
index a5219c138b..be73da47a4 100644
--- a/testsuite/tests/rename/should_fail/rnfail034.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail034.stderr
@@ -3,4 +3,4 @@ rnfail034.hs:4:11: error: Qualified name in binding position: M.y
 
 rnfail034.hs:4:26: error:
     Not in scope: ‘M.y’
-    Perhaps you meant ‘M.g’ (line 4)
+    Suggested fix: Perhaps use ‘M.g’ (line 4)