Convert More Diagnostics (#20116)

Replaces uses of `TcRnUnknownMessage` with proper diagnostics
constructors.

9 files changed, 15 insertions, 15 deletions

diff --git a/testsuite/tests/linters/notes.stdout b/testsuite/tests/linters/notes.stdout
index 16fd6a02ac..2ce1e21ae1 100644
--- a/testsuite/tests/linters/notes.stdout
+++ b/testsuite/tests/linters/notes.stdout
@@ -58,6 +58,7 @@ ref    compiler/GHC/StgToCmm/Expr.hs:848:3:     Note [alg-alt heap check]
 ref    compiler/GHC/Tc/Errors.hs:180:13:     Note [Fail fast on kind errors]
 ref    compiler/GHC/Tc/Errors.hs:2016:0:     Note [Highlighting ambiguous type variables]
 ref    compiler/GHC/Tc/Errors/Ppr.hs:1760:11:     Note [Highlighting ambiguous type variables]
+ref    compiler/GHC/Tc/Errors/Types.hs:2986:28:     Note [Don't promote data constructors with non-equality contexts]
 ref    compiler/GHC/Tc/Gen/Arrow.hs:435:29:     Note [RecStmt]
 ref    compiler/GHC/Tc/Gen/Bind.hs:1397:19:     Note [Existentials in pattern bindings]
 ref    compiler/GHC/Tc/Gen/Export.hs:187:15:     Note [Modules without a module header]
@@ -94,7 +95,6 @@ ref    compiler/GHC/Tc/TyCl.hs:4366:16:     Note [rejigCon and c.f. Note [Check
 ref    compiler/GHC/Tc/TyCl/Instance.hs:947:26:     Note [Generalising in tcFamTyPatsGuts]
 ref    compiler/GHC/Tc/Types.hs:647:17:     Note [Generating fresh names for FFI wrappers]
 ref    compiler/GHC/Tc/Types.hs:696:33:     Note [Extra dependencies from .hs-boot files]
-ref    compiler/GHC/Tc/Types.hs:1154:28:     Note [Don't promote data constructors with non-equality contexts]
 ref    compiler/GHC/Tc/Types.hs:1230:36:     Note [Bindings with closed types]
 ref    compiler/GHC/Tc/Types.hs:1466:47:     Note [Care with plugin imports]
 ref    compiler/GHC/Tc/Types/Constraint.hs:238:34:     Note [NonCanonical Semantics]
diff --git a/testsuite/tests/patsyn/should_fail/records-exquant.stderr b/testsuite/tests/patsyn/should_fail/records-exquant.stderr
index e742ada348..b5c3fddcc3 100644
--- a/testsuite/tests/patsyn/should_fail/records-exquant.stderr
+++ b/testsuite/tests/patsyn/should_fail/records-exquant.stderr
@@ -1,11 +1,11 @@
 
 records-exquant.hs:8:7: error:
-    Cannot use record selector ‘a’ as a function due to escaped type variables
-    Probable fix: use pattern-matching syntax instead
-    In the expression: a (Showable True)
-    In an equation for ‘qux’: qux = a (Showable True)
+    • Cannot use record selector ‘a’ as a function due to escaped type variables
+    • In the expression: a (Showable True)
+      In an equation for ‘qux’: qux = a (Showable True)
+    Suggested fix: Use pattern-matching syntax instead
 
 records-exquant.hs:10:7: error:
-    Record update for insufficiently polymorphic field: a :: a
-    In the expression: (Showable ()) {a = True}
-    In an equation for ‘foo’: foo = (Showable ()) {a = True}
+    • Record update for insufficiently polymorphic field: a :: a
+    • In the expression: (Showable ()) {a = True}
+      In an equation for ‘foo’: foo = (Showable ()) {a = True}
diff --git a/testsuite/tests/typecheck/should_fail/T12729.stderr b/testsuite/tests/typecheck/should_fail/T12729.stderr
index 6bf544fe47..9fdcd6f940 100644
--- a/testsuite/tests/typecheck/should_fail/T12729.stderr
+++ b/testsuite/tests/typecheck/should_fail/T12729.stderr
@@ -1,5 +1,5 @@
 
 T12729.hs:7:1: error:
     • Newtype has non-* return kind ‘TYPE 'IntRep’
-      Perhaps you intended to use UnliftedNewtypes
     • In the newtype declaration for ‘A’
+    Suggested fix: Perhaps you intended to use UnliftedNewtypes
diff --git a/testsuite/tests/typecheck/should_fail/T15883.stderr b/testsuite/tests/typecheck/should_fail/T15883.stderr
index d65ffa5ebc..c66d510932 100644
--- a/testsuite/tests/typecheck/should_fail/T15883.stderr
+++ b/testsuite/tests/typecheck/should_fail/T15883.stderr
@@ -1,5 +1,5 @@
 
 T15883.hs:9:1: error:
     • Newtype has non-* return kind ‘TYPE rep’
-      Perhaps you intended to use UnliftedNewtypes
     • In the newtype declaration for ‘Foo’
+    Suggested fix: Perhaps you intended to use UnliftedNewtypes
diff --git a/testsuite/tests/typecheck/should_fail/T16829a.stderr b/testsuite/tests/typecheck/should_fail/T16829a.stderr
index bbad3415d6..f53d6ccfd6 100644
--- a/testsuite/tests/typecheck/should_fail/T16829a.stderr
+++ b/testsuite/tests/typecheck/should_fail/T16829a.stderr
@@ -1,5 +1,5 @@
 
 T16829a.hs:9:1: error:
     • Newtype has non-* return kind ‘TYPE 'IntRep’
-      Perhaps you intended to use UnliftedNewtypes
     • In the newtype declaration for ‘T’
+    Suggested fix: Perhaps you intended to use UnliftedNewtypes
diff --git a/testsuite/tests/typecheck/should_fail/T16829b.stderr b/testsuite/tests/typecheck/should_fail/T16829b.stderr
index 633d8988a7..9d4c5057ca 100644
--- a/testsuite/tests/typecheck/should_fail/T16829b.stderr
+++ b/testsuite/tests/typecheck/should_fail/T16829b.stderr
@@ -1,5 +1,5 @@
 
 T16829b.hs:10:1: error:
     • Newtype instance has non-* return kind ‘TYPE 'IntRep’
-      Perhaps you intended to use UnliftedNewtypes
     • In the newtype instance declaration for ‘T’
+    Suggested fix: Perhaps you intended to use UnliftedNewtypes
diff --git a/testsuite/tests/typecheck/should_fail/T3176.stderr b/testsuite/tests/typecheck/should_fail/T3176.stderr
index 1f089da6fe..d2867df4a1 100644
--- a/testsuite/tests/typecheck/should_fail/T3176.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3176.stderr
@@ -1,7 +1,7 @@
 
 T3176.hs:9:27: error:
     • Cannot use record selector ‘unES’ as a function due to escaped type variables
-      Probable fix: use pattern-matching syntax instead
     • In the first argument of ‘($)’, namely ‘unES’
       In the second argument of ‘($)’, namely ‘unES $ f t’
       In the expression: show $ unES $ f t
+    Suggested fix: Use pattern-matching syntax instead
diff --git a/testsuite/tests/typecheck/should_fail/UnliftedNewtypesNotEnabled.stderr b/testsuite/tests/typecheck/should_fail/UnliftedNewtypesNotEnabled.stderr
index d45f3ca016..59c5c523a2 100644
--- a/testsuite/tests/typecheck/should_fail/UnliftedNewtypesNotEnabled.stderr
+++ b/testsuite/tests/typecheck/should_fail/UnliftedNewtypesNotEnabled.stderr
@@ -1,5 +1,5 @@
 
 UnliftedNewtypesNotEnabled.hs:9:1: error:
     • Newtype has non-* return kind ‘TYPE 'GHC.Types.IntRep’
-      Perhaps you intended to use UnliftedNewtypes
     • In the newtype declaration for ‘Baz’
+    Suggested fix: Perhaps you intended to use UnliftedNewtypes
diff --git a/testsuite/tests/typecheck/should_fail/tcfail079.stderr b/testsuite/tests/typecheck/should_fail/tcfail079.stderr
index dce069a456..8f28c7d41c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail079.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail079.stderr
@@ -1,5 +1,5 @@
 
 tcfail079.hs:9:1: error:
     • Newtype has non-* return kind ‘TYPE 'GHC.Types.IntRep’
-      Perhaps you intended to use UnliftedNewtypes
     • In the newtype declaration for ‘Unboxed’
+    Suggested fix: Perhaps you intended to use UnliftedNewtypes