Use diagnostic infrastructure in GHC.Tc.Errors

8 files changed, 20 insertions, 17 deletions

diff --git a/testsuite/tests/ghci/prog009/ghci.prog009.stderr b/testsuite/tests/ghci/prog009/ghci.prog009.stderr
index 4f9cf12a3e..e8e5d4ab3e 100644
--- a/testsuite/tests/ghci/prog009/ghci.prog009.stderr
+++ b/testsuite/tests/ghci/prog009/ghci.prog009.stderr
@@ -2,7 +2,7 @@
 A.hs:1:16: error: parse error on input ‘where’
 
 <interactive>:25:1: error:
-    • Variable not in scope: yan
-    • Perhaps you meant ‘tan’ (imported from Prelude)
+    Variable not in scope: yan
+    Suggested fix: Perhaps use ‘tan’ (imported from Prelude)
 
 A.hs:1:16: error: parse error on input ‘where’
diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr
index c25cc4b81f..3477f47b17 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stderr
+++ b/testsuite/tests/ghci/scripts/Defer02.stderr
@@ -17,10 +17,10 @@ Defer01.hs:25:1: warning: [-Woverlapping-patterns (in -Wdefault)]
     In an equation for ‘c’: c (C2 x) = ...
 
 Defer01.hs:25:4: warning: [-Winaccessible-code (in -Wdefault)]
-    • Couldn't match type ‘Int’ with ‘Bool’
-      Inaccessible code in
+    • Inaccessible code in
         a pattern with constructor: C2 :: Bool -> C Bool,
         in an equation for ‘c’
+      Couldn't match type ‘Int’ with ‘Bool’
     • In the pattern: C2 x
       In an equation for ‘c’: c (C2 x) = True
 
diff --git a/testsuite/tests/ghci/scripts/T20455.stderr b/testsuite/tests/ghci/scripts/T20455.stderr
index cb94e6ee3d..61870da12a 100644
--- a/testsuite/tests/ghci/scripts/T20455.stderr
+++ b/testsuite/tests/ghci/scripts/T20455.stderr
@@ -1,7 +1,8 @@
 
 <interactive>:3:1: error:
-    • Variable not in scope: ll
-    • Perhaps you meant one of these:
+    Variable not in scope: ll
+    Suggested fix:
+      Perhaps use one of these:
         ‘Ghci1.l’ (imported from Ghci1), ‘l’ (line 2),
         ‘all’ (imported from Prelude)
 
diff --git a/testsuite/tests/ghci/scripts/T2452.stderr b/testsuite/tests/ghci/scripts/T2452.stderr
index 99b0acbd21..c6f37c6680 100644
--- a/testsuite/tests/ghci/scripts/T2452.stderr
+++ b/testsuite/tests/ghci/scripts/T2452.stderr
@@ -1,8 +1,8 @@
 
 <interactive>:1:1: error:
     Not in scope: ‘System.IO.hPutStrLn’
-    No module named ‘System.IO’ is imported.
+    NB: no module named ‘System.IO’ is imported.
 
 <interactive>:1:1: error:
     Not in scope: ‘System.IO.hPutStrLn’
-    No module named ‘System.IO’ is imported.
+    NB: no module named ‘System.IO’ is imported.
diff --git a/testsuite/tests/ghci/scripts/T5564.stderr b/testsuite/tests/ghci/scripts/T5564.stderr
index 89de0f18e3..2338e22e03 100644
--- a/testsuite/tests/ghci/scripts/T5564.stderr
+++ b/testsuite/tests/ghci/scripts/T5564.stderr
@@ -1,10 +1,11 @@
 
 <interactive>:2:1: error:
-    • Variable not in scope: git
-    • Perhaps you meant ‘it’ (line 1)
+    Variable not in scope: git
+    Suggested fix: Perhaps use ‘it’ (line 1)
 
 <interactive>:4:1: error:
-    • Variable not in scope: fit
-    • Perhaps you meant one of these:
+    Variable not in scope: fit
+    Suggested fix:
+      Perhaps use one of these:
         ‘Ghci1.it’ (imported from Ghci1), ‘it’ (line 3),
         ‘fst’ (imported from Prelude)
diff --git a/testsuite/tests/ghci/scripts/T8485.stderr b/testsuite/tests/ghci/scripts/T8485.stderr
index d1c005b9f6..8d77f82eaa 100644
--- a/testsuite/tests/ghci/scripts/T8485.stderr
+++ b/testsuite/tests/ghci/scripts/T8485.stderr
@@ -1,4 +1,5 @@
 
 <interactive>:2:11: error:
     The role annotation for ‘X’ lacks an accompanying binding
-      (The role annotation must be given where ‘X’ is declared)
+    Suggested fix:
+      Move the role annotation to the declaration site of ‘X’.
diff --git a/testsuite/tests/ghci/scripts/T8639.stderr b/testsuite/tests/ghci/scripts/T8639.stderr
index ee06e6e70c..9764bcdf67 100644
--- a/testsuite/tests/ghci/scripts/T8639.stderr
+++ b/testsuite/tests/ghci/scripts/T8639.stderr
@@ -1,5 +1,5 @@
 
 <interactive>:1:1: error:
     Not in scope: ‘H.bit’
-    Perhaps you meant ‘Q.bit’ (imported from T8639)
-    No module named ‘H’ is imported.
+    NB: no module named ‘H’ is imported.
+    Suggested fix: Perhaps use ‘Q.bit’ (imported from T8639)
diff --git a/testsuite/tests/ghci/scripts/ghci036.stderr b/testsuite/tests/ghci/scripts/ghci036.stderr
index 5b44b562a7..482fac7e62 100644
--- a/testsuite/tests/ghci/scripts/ghci036.stderr
+++ b/testsuite/tests/ghci/scripts/ghci036.stderr
@@ -9,10 +9,10 @@
 
 <interactive>:1:1: error:
     Variable not in scope: nub
-    Perhaps you meant ‘L.nub’ (imported from Data.List)
+    Suggested fix: Perhaps use ‘L.nub’ (imported from Data.List)
 
 <interactive>:1:1: error:
     Not in scope: ‘L.nub’
-    No module named ‘L’ is imported.
+    NB: no module named ‘L’ is imported.
 
 <interactive>:1:1: error: Variable not in scope: nub