Convert diagnostics in GHC.Rename.Module to proper TcRnMessage (#20115)

I've turned almost all occurrences of TcRnUnknownMessage in GHC.Rename.Module
module into a proper TcRnMessage.
Instead, these TcRnMessage messages were introduced:
  TcRnIllegalInstanceHeadDecl
  TcRnUnexpectedStandaloneDerivingDecl
  TcRnUnusedVariableInRuleDecl
  TcRnUnexpectedStandaloneKindSig
  TcRnIllegalRuleLhs
  TcRnBadAssocRhs
  TcRnDuplicateRoleAnnot
  TcRnDuplicateKindSig
  TcRnIllegalDerivStrategy
  TcRnIllegalMultipleDerivClauses
  TcRnNoDerivStratSpecified
  TcRnStupidThetaInGadt
  TcRnBadImplicitSplice
  TcRnShadowedTyVarNameInFamResult
  TcRnIncorrectTyVarOnLhsOfInjCond
  TcRnUnknownTyVarsOnRhsOfInjCond

Was introduced one helper type:
  RuleLhsErrReason

28 files changed, 111 insertions, 85 deletions

diff --git a/testsuite/tests/deriving/should_fail/T10598_fail4.stderr b/testsuite/tests/deriving/should_fail/T10598_fail4.stderr
index e5447d9489..ce6a1cd4d8 100644
--- a/testsuite/tests/deriving/should_fail/T10598_fail4.stderr
+++ b/testsuite/tests/deriving/should_fail/T10598_fail4.stderr
@@ -1,4 +1,4 @@
 
-T10598_fail4.hs:4:12: error:
+T10598_fail4.hs:4:12: error: [GHC-87139]
     Illegal deriving strategy: stock
-    Use DerivingStrategies to enable this extension
+    Suggested fix: Perhaps you intended to use DerivingStrategies
diff --git a/testsuite/tests/deriving/should_fail/T10598_fail5.stderr b/testsuite/tests/deriving/should_fail/T10598_fail5.stderr
index af38cdcc51..b6b3877d32 100644
--- a/testsuite/tests/deriving/should_fail/T10598_fail5.stderr
+++ b/testsuite/tests/deriving/should_fail/T10598_fail5.stderr
@@ -1,4 +1,4 @@
 
-T10598_fail5.hs:3:1: error:
+T10598_fail5.hs:3:1: error: [GHC-30281]
     Illegal use of multiple, consecutive deriving clauses
-    Use DerivingStrategies to allow this
+    Suggested fix: Perhaps you intended to use DerivingStrategies
diff --git a/testsuite/tests/deriving/should_fail/deriving-via-fail3.stderr b/testsuite/tests/deriving/should_fail/deriving-via-fail3.stderr
index 43c395e5cd..b2fb98469a 100644
--- a/testsuite/tests/deriving/should_fail/deriving-via-fail3.stderr
+++ b/testsuite/tests/deriving/should_fail/deriving-via-fail3.stderr
@@ -1,4 +1,4 @@
 
-deriving-via-fail3.hs:3:20: error:
+deriving-via-fail3.hs:3:20: error: [GHC-87139]
     Illegal deriving strategy: via
-    Use DerivingVia to enable this extension
+    Suggested fix: Perhaps you intended to use DerivingVia
diff --git a/testsuite/tests/ghci/prog019/prog019.stderr b/testsuite/tests/ghci/prog019/prog019.stderr
index 2a6fd015e4..208cbd6087 100644
--- a/testsuite/tests/ghci/prog019/prog019.stderr
+++ b/testsuite/tests/ghci/prog019/prog019.stderr
@@ -1,8 +1,8 @@
 
-B2.hs:3:1: error:
+B2.hs:3:1: error: [GHC-25277]
     Parse error: module header, import declaration
     or top-level declaration expected.
 
-D.hs:3:1: error:
+D.hs:3:1: error: [GHC-25277]
     Parse error: module header, import declaration
     or top-level declaration expected.
diff --git a/testsuite/tests/ghci/scripts/T1914.stderr b/testsuite/tests/ghci/scripts/T1914.stderr
index 6dd83fab58..1344f3ce04 100644
--- a/testsuite/tests/ghci/scripts/T1914.stderr
+++ b/testsuite/tests/ghci/scripts/T1914.stderr
@@ -1,4 +1,4 @@
 
-T1914A.hs:1:38:
+T1914A.hs:1:38: error: [GHC-25277]
     Parse error: module header, import declaration
     or top-level declaration expected.
diff --git a/testsuite/tests/ghci/scripts/T6018ghcirnfail.stderr b/testsuite/tests/ghci/scripts/T6018ghcirnfail.stderr
index 96b4dcd95d..d1d9d5ce38 100644
--- a/testsuite/tests/ghci/scripts/T6018ghcirnfail.stderr
+++ b/testsuite/tests/ghci/scripts/T6018ghcirnfail.stderr
@@ -1,46 +1,46 @@
 
-<interactive>:10:23: error:
+<interactive>:10:23: error: [GHC-88333]
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-<interactive>:11:24: error:
+<interactive>:11:24: error: [GHC-88333]
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-<interactive>:12:37: error:
+<interactive>:12:37: error: [GHC-88333]
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-<interactive>:15:19: error:
+<interactive>:15:19: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-<interactive>:16:20: error:
+<interactive>:16:20: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-<interactive>:19:20: error:
+<interactive>:19:20: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-<interactive>:19:24: error:
+<interactive>:19:24: error: [GHC-48254]
     Unknown type variable on the RHS of injectivity condition: a
 
-<interactive>:20:21: error:
+<interactive>:20:21: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-<interactive>:20:25: error:
+<interactive>:20:25: error: [GHC-48254]
     Unknown type variable on the RHS of injectivity condition: a
 
-<interactive>:21:35: error:
+<interactive>:21:35: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-<interactive>:21:39: error:
+<interactive>:21:39: error: [GHC-48254]
     Unknown type variable on the RHS of injectivity condition: a
 
 <interactive>:24:1: error: [GHC-76037]
@@ -61,9 +61,9 @@
 <interactive>:36:23: error: [GHC-76037]
     Not in scope: type variable ‘c’
 
-<interactive>:39:33: error:
+<interactive>:39:33: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-<interactive>:42:37: error:
+<interactive>:42:37: error: [GHC-48254]
     Unknown type variable on the RHS of injectivity condition: b
diff --git a/testsuite/tests/ghci/scripts/T6106.stderr b/testsuite/tests/ghci/scripts/T6106.stderr
index 7023e2f709..e7e7047e05 100644
--- a/testsuite/tests/ghci/scripts/T6106.stderr
+++ b/testsuite/tests/ghci/scripts/T6106.stderr
@@ -1,4 +1,4 @@
 
-T6106.hs:1:1:
+T6106.hs:1:1: error: [GHC-25277]
     Parse error: module header, import declaration
     or top-level declaration expected.
diff --git a/testsuite/tests/indexed-types/should_fail/T5515.stderr b/testsuite/tests/indexed-types/should_fail/T5515.stderr
index 688eef697e..29690e469b 100644
--- a/testsuite/tests/indexed-types/should_fail/T5515.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T5515.stderr
@@ -1,8 +1,8 @@
 
-T5515.hs:9:3: error:
+T5515.hs:9:3: error: [GHC-53634]
     The RHS of an associated type declaration mentions out-of-scope variable ‘a’
       All such variables must be bound on the LHS
 
-T5515.hs:15:3: error:
+T5515.hs:15:3: error: [GHC-53634]
     The RHS of an associated type declaration mentions out-of-scope variable ‘a’
       All such variables must be bound on the LHS
diff --git a/testsuite/tests/parser/should_fail/T3811c.stderr b/testsuite/tests/parser/should_fail/T3811c.stderr
index 6d662a9b16..5d9b794f98 100644
--- a/testsuite/tests/parser/should_fail/T3811c.stderr
+++ b/testsuite/tests/parser/should_fail/T3811c.stderr
@@ -1,7 +1,7 @@
 
-T3811c.hs:6:10: error:
-    Illegal head of an instance declaration: ‘!Show D’
-      Instance heads must be of the form
-        C ty_1 ... ty_n
-      where ‘C’ is a class
-    In an instance declaration
+T3811c.hs:6:10: error: [GHC-12222]
+    • Illegal head of an instance declaration: ‘!Show D’
+        Instance heads must be of the form
+          C ty_1 ... ty_n
+        where ‘C’ is a class
+    • In an instance declaration
diff --git a/testsuite/tests/polykinds/T9574.stderr b/testsuite/tests/polykinds/T9574.stderr
index 26f2925ed9..c21c599d2f 100644
--- a/testsuite/tests/polykinds/T9574.stderr
+++ b/testsuite/tests/polykinds/T9574.stderr
@@ -1,4 +1,4 @@
 
-T9574.hs:13:5: error:
+T9574.hs:13:5: error: [GHC-53634]
     The RHS of an associated type declaration mentions out-of-scope variable ‘o’
       All such variables must be bound on the LHS
diff --git a/testsuite/tests/rename/should_compile/T15798a.stderr b/testsuite/tests/rename/should_compile/T15798a.stderr
index 6832205228..90615e8302 100644
--- a/testsuite/tests/rename/should_compile/T15798a.stderr
+++ b/testsuite/tests/rename/should_compile/T15798a.stderr
@@ -1,3 +1,3 @@
 
-T15798a.hs:11:3: warning: [-Wmissing-deriving-strategies]
+T15798a.hs:11:3: warning: [GHC-55631] [-Wmissing-deriving-strategies]
     No deriving strategy specified. Did you want stock, newtype, or anyclass?
diff --git a/testsuite/tests/rename/should_compile/T15798b.stderr b/testsuite/tests/rename/should_compile/T15798b.stderr
index de1b09ee48..a2a368b8b7 100644
--- a/testsuite/tests/rename/should_compile/T15798b.stderr
+++ b/testsuite/tests/rename/should_compile/T15798b.stderr
@@ -1,4 +1,4 @@
 
-T15798b.hs:9:19: warning: [-Wmissing-deriving-strategies]
+T15798b.hs:9:19: warning: [GHC-55631] [-Wmissing-deriving-strategies]
     No deriving strategy specified. Did you want stock, newtype, or anyclass?
-    Use DerivingStrategies to specify a strategy.
+    Suggested fix: Perhaps you intended to use DerivingStrategies
diff --git a/testsuite/tests/rename/should_compile/T15798c.stderr b/testsuite/tests/rename/should_compile/T15798c.stderr
index 868266aa3a..5b36d2b733 100644
--- a/testsuite/tests/rename/should_compile/T15798c.stderr
+++ b/testsuite/tests/rename/should_compile/T15798c.stderr
@@ -1,4 +1,4 @@
 
-T15798c.hs:6:3: warning: [-Wmissing-deriving-strategies]
+T15798c.hs:6:3: warning: [GHC-55631] [-Wmissing-deriving-strategies]
     No deriving strategy specified. Did you want stock, newtype, or anyclass?
-    Use DerivingStrategies to specify a strategy.
+    Suggested fix: Perhaps you intended to use DerivingStrategies
diff --git a/testsuite/tests/rename/should_fail/ExplicitForAllRules2.stderr b/testsuite/tests/rename/should_fail/ExplicitForAllRules2.stderr
index 8930d4d1fd..09b48e0272 100644
--- a/testsuite/tests/rename/should_fail/ExplicitForAllRules2.stderr
+++ b/testsuite/tests/rename/should_fail/ExplicitForAllRules2.stderr
@@ -2,7 +2,7 @@
 ExplicitForAllRules2.hs:6:41: error: [GHC-76037]
     Not in scope: type variable ‘b’
 
-ExplicitForAllRules2.hs:7:11: error:
+ExplicitForAllRules2.hs:7:11: error: [GHC-65669]
     Rule "new5":
     Forall'd variable ‘x’ does not appear on left hand side
 
diff --git a/testsuite/tests/rename/should_fail/RnStupidThetaInGadt.hs b/testsuite/tests/rename/should_fail/RnStupidThetaInGadt.hs
new file mode 100644
index 0000000000..e9310af418
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/RnStupidThetaInGadt.hs
@@ -0,0 +1,6 @@
+{-# LANGUAGE DatatypeContexts #-}
+module RnStupidThetaInGadt where
+
+
+data (Eq a) => Foo a where
+  MkFoo :: Int
diff --git a/testsuite/tests/rename/should_fail/RnStupidThetaInGadt.stderr b/testsuite/tests/rename/should_fail/RnStupidThetaInGadt.stderr
new file mode 100644
index 0000000000..f1bf190b6e
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/RnStupidThetaInGadt.stderr
@@ -0,0 +1,7 @@
+
+RnStupidThetaInGadt.hs:1:14: warning: [-Wdeprecated-flags (in -Wdefault)]
+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
+
+RnStupidThetaInGadt.hs:5:1: error: [GHC-18403]
+    No context is allowed on a GADT-style data declaration
+    (You can put a context on each constructor, though.)
diff --git a/testsuite/tests/rename/should_fail/RnUnexpectedStandaloneDeriving.hs b/testsuite/tests/rename/should_fail/RnUnexpectedStandaloneDeriving.hs
new file mode 100644
index 0000000000..93670a40cb
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/RnUnexpectedStandaloneDeriving.hs
@@ -0,0 +1,7 @@
+{-# LANGUAGE Haskell2010 #-}
+
+module RnUnexpectedStandaloneDeriving where
+
+data Foo = Foo
+
+deriving instance Eq Foo
diff --git a/testsuite/tests/rename/should_fail/RnUnexpectedStandaloneDeriving.stderr b/testsuite/tests/rename/should_fail/RnUnexpectedStandaloneDeriving.stderr
new file mode 100644
index 0000000000..33cbd49a29
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/RnUnexpectedStandaloneDeriving.stderr
@@ -0,0 +1,4 @@
+
+RnUnexpectedStandaloneDeriving.hs:7:1: error: [GHC-95159]
+    Illegal standalone deriving declaration
+    Suggested fix: Perhaps you intended to use StandaloneDeriving
diff --git a/testsuite/tests/rename/should_fail/T12146.stderr b/testsuite/tests/rename/should_fail/T12146.stderr
index 0dcd15470d..ad84fbbaa8 100644
--- a/testsuite/tests/rename/should_fail/T12146.stderr
+++ b/testsuite/tests/rename/should_fail/T12146.stderr
@@ -1,4 +1,4 @@
 
-T12146.hs:5:1:
+T12146.hs:5:1: error: [GHC-25277]
     Parse error: module header, import declaration
     or top-level declaration expected.
diff --git a/testsuite/tests/rename/should_fail/T15659.stderr b/testsuite/tests/rename/should_fail/T15659.stderr
index e1cbf9f079..d090f3c6d3 100644
--- a/testsuite/tests/rename/should_fail/T15659.stderr
+++ b/testsuite/tests/rename/should_fail/T15659.stderr
@@ -1,5 +1,5 @@
 
-T15659.hs:3:11: error:
+T15659.hs:3:11: error: [GHC-63294]
     Rule "test":
       Not in scope: ‘f’
       in left-hand side: f x
diff --git a/testsuite/tests/rename/should_fail/T18021.stderr b/testsuite/tests/rename/should_fail/T18021.stderr
index 11fcea9964..c335a11a25 100644
--- a/testsuite/tests/rename/should_fail/T18021.stderr
+++ b/testsuite/tests/rename/should_fail/T18021.stderr
@@ -1,8 +1,8 @@
 
-T18021.hs:12:3: error:
+T18021.hs:12:3: error: [GHC-53634]
     The RHS of an associated type declaration mentions out-of-scope variable ‘a’
       All such variables must be bound on the LHS
 
-T18021.hs:17:3: error:
+T18021.hs:17:3: error: [GHC-53634]
     The RHS of an associated type declaration mentions out-of-scope variable ‘a’
       All such variables must be bound on the LHS
diff --git a/testsuite/tests/rename/should_fail/T18240a.stderr b/testsuite/tests/rename/should_fail/T18240a.stderr
index 50b419add4..165ede31c6 100644
--- a/testsuite/tests/rename/should_fail/T18240a.stderr
+++ b/testsuite/tests/rename/should_fail/T18240a.stderr
@@ -1,43 +1,43 @@
 
 T18240a.hs:11:11: error:
-    Instance head cannot contain nested ‘forall’s or contexts
-    In an instance declaration
+    • Instance head cannot contain nested ‘forall’s or contexts
+    • In an instance declaration
 
 T18240a.hs:12:15: error: [GHC-76037]
     Not in scope: type variable ‘a’
 
 T18240a.hs:14:11: error:
-    Instance head cannot contain nested ‘forall’s or contexts
-    In an instance declaration
+    • Instance head cannot contain nested ‘forall’s or contexts
+    • In an instance declaration
 
 T18240a.hs:17:11: error:
-    Instance head cannot contain nested ‘forall’s or contexts
-    In an instance declaration
+    • Instance head cannot contain nested ‘forall’s or contexts
+    • In an instance declaration
 
 T18240a.hs:18:22: error: [GHC-76037]
     Not in scope: type variable ‘a’
 
 T18240a.hs:20:21: error:
-    Instance head cannot contain nested ‘forall’s or contexts
-    In an instance declaration
+    • Instance head cannot contain nested ‘forall’s or contexts
+    • In an instance declaration
 
 T18240a.hs:21:24: error: [GHC-76037]
     Not in scope: type variable ‘b’
 
 T18240a.hs:23:19: error:
-    Instance head cannot contain nested ‘forall’s or contexts
-    In an instance declaration
-
-T18240a.hs:28:10: error:
-    Illegal head of an instance declaration: ‘42’
-      Instance heads must be of the form
-        C ty_1 ... ty_n
-      where ‘C’ is a class
-    In an instance declaration
-
-T18240a.hs:29:10: error:
-    Illegal head of an instance declaration: ‘Int -> Int’
-      Instance heads must be of the form
-        C ty_1 ... ty_n
-      where ‘C’ is a class
-    In an instance declaration
+    • Instance head cannot contain nested ‘forall’s or contexts
+    • In an instance declaration
+
+T18240a.hs:28:10: error: [GHC-12222]
+    • Illegal head of an instance declaration: ‘42’
+        Instance heads must be of the form
+          C ty_1 ... ty_n
+        where ‘C’ is a class
+    • In an instance declaration
+
+T18240a.hs:29:10: error: [GHC-12222]
+    • Illegal head of an instance declaration: ‘Int -> Int’
+        Instance heads must be of the form
+          C ty_1 ... ty_n
+        where ‘C’ is a class
+    • In an instance declaration
diff --git a/testsuite/tests/rename/should_fail/T4042.stderr b/testsuite/tests/rename/should_fail/T4042.stderr
index 65d737b6bd..a3b87404e1 100644
--- a/testsuite/tests/rename/should_fail/T4042.stderr
+++ b/testsuite/tests/rename/should_fail/T4042.stderr
@@ -1,4 +1,4 @@
 
-T4042.hs:6:1:
+T4042.hs:6:1: error: [GHC-25277]
     Parse error: module header, import declaration
     or top-level declaration expected.
diff --git a/testsuite/tests/rename/should_fail/T6018rnfail.stderr b/testsuite/tests/rename/should_fail/T6018rnfail.stderr
index 8833ad8fbd..55abeccbcf 100644
--- a/testsuite/tests/rename/should_fail/T6018rnfail.stderr
+++ b/testsuite/tests/rename/should_fail/T6018rnfail.stderr
@@ -1,46 +1,46 @@
 
-T6018rnfail.hs:8:23: error:
+T6018rnfail.hs:8:23: error: [GHC-88333]
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-T6018rnfail.hs:9:24: error:
+T6018rnfail.hs:9:24: error: [GHC-88333]
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-T6018rnfail.hs:12:19: error:
+T6018rnfail.hs:12:19: error: [GHC-88333]
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-T6018rnfail.hs:15:19: error:
+T6018rnfail.hs:15:19: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:16:20: error:
+T6018rnfail.hs:16:20: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:20:20: error:
+T6018rnfail.hs:20:20: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:20:24: error:
+T6018rnfail.hs:20:24: error: [GHC-48254]
     Unknown type variable on the RHS of injectivity condition: a
 
-T6018rnfail.hs:21:21: error:
+T6018rnfail.hs:21:21: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:21:25: error:
+T6018rnfail.hs:21:25: error: [GHC-48254]
     Unknown type variable on the RHS of injectivity condition: a
 
-T6018rnfail.hs:24:16: error:
+T6018rnfail.hs:24:16: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:24:20: error:
+T6018rnfail.hs:24:20: error: [GHC-48254]
     Unknown type variable on the RHS of injectivity condition: a
 
 T6018rnfail.hs:27:1: error: [GHC-76037]
@@ -61,11 +61,11 @@ T6018rnfail.hs:35:1: error: [GHC-76037]
 T6018rnfail.hs:38:3: error: [GHC-76037]
     Not in scope: type variable ‘c’
 
-T6018rnfail.hs:42:15: error:
+T6018rnfail.hs:42:15: error: [GHC-99412]
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:46:19: error:
+T6018rnfail.hs:46:19: error: [GHC-48254]
     Unknown type variable on the RHS of injectivity condition: b
 
 T6018rnfail.hs:49:21: error: [GHC-76037]
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index 6234f4a85d..2255117886 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -192,3 +192,5 @@ test('RnMultipleFixityFail', normal, compile_fail, [''])
 test('RnEmptyCaseFail', normal, compile_fail, [''])
 test('RnDefaultSigFail', normal, compile_fail, [''])
 test('RnMultipleMinimalPragmaFail', normal, compile_fail, [''])
+test('RnUnexpectedStandaloneDeriving', normal, compile_fail, [''])
+test('RnStupidThetaInGadt', normal, compile_fail, [''])
diff --git a/testsuite/tests/roles/should_fail/Roles8.stderr b/testsuite/tests/roles/should_fail/Roles8.stderr
index 5f21527942..e06e03bfb5 100644
--- a/testsuite/tests/roles/should_fail/Roles8.stderr
+++ b/testsuite/tests/roles/should_fail/Roles8.stderr
@@ -1,10 +1,10 @@
 
-Roles8.hs:7:1:
+Roles8.hs:8:1: error: [GHC-97170]
     Duplicate role annotations for ‘T1’:
       type role T1 nominal -- written at Roles8.hs:7:1-20
       type role T1 nominal -- written at Roles8.hs:8:1-20
 
-Roles8.hs:12:1:
+Roles8.hs:13:1: error: [GHC-97170]
     Duplicate role annotations for ‘T2’:
       type role T2 representational -- written at Roles8.hs:12:1-29
       type role T2 phantom -- written at Roles8.hs:13:1-20
diff --git a/testsuite/tests/saks/should_fail/saks_fail001.stderr b/testsuite/tests/saks/should_fail/saks_fail001.stderr
index ed20d70860..a85605cafc 100644
--- a/testsuite/tests/saks/should_fail/saks_fail001.stderr
+++ b/testsuite/tests/saks/should_fail/saks_fail001.stderr
@@ -1,4 +1,4 @@
 
-saks_fail001.hs:8:1: error:
+saks_fail001.hs:8:1: error: [GHC-45906]
     Illegal standalone kind signature
-      Did you mean to enable StandaloneKindSignatures?
+    Suggested fix: Perhaps you intended to use StandaloneKindSignatures
diff --git a/testsuite/tests/saks/should_fail/saks_fail002.stderr b/testsuite/tests/saks/should_fail/saks_fail002.stderr
index bac0492f3a..c9069d2265 100644
--- a/testsuite/tests/saks/should_fail/saks_fail002.stderr
+++ b/testsuite/tests/saks/should_fail/saks_fail002.stderr
@@ -1,5 +1,5 @@
 
-saks_fail002.hs:9:1: error:
+saks_fail002.hs:11:1: error: [GHC-43371]
     Duplicate standalone kind signatures for ‘D’:
       type D :: Type -- written at saks_fail002.hs:9:1-14
       type D :: Type -- written at saks_fail002.hs:10:1-14