Diagnostic codes: acccept test changes

The testsuite output now contains diagnostic codes, so many tests need
to be updated at once.
We decided it was best to keep the diagnostic codes in the testsuite
output, so that contributors don't inadvertently make changes to the
diagnostic codes.

51 files changed, 77 insertions, 76 deletions

diff --git a/testsuite/tests/dependent/should_compile/KindEqualities.stderr b/testsuite/tests/dependent/should_compile/KindEqualities.stderr
index c6987e29f3..311ff65b4b 100644
--- a/testsuite/tests/dependent/should_compile/KindEqualities.stderr
+++ b/testsuite/tests/dependent/should_compile/KindEqualities.stderr
@@ -1,5 +1,5 @@
 
-KindEqualities.hs:25:1: warning: [-Wincomplete-patterns (in -Wextra)]
+KindEqualities.hs:25:1: warning: [GHC-62161] [-Wincomplete-patterns (in -Wextra)]
     Pattern match(es) are non-exhaustive
     In an equation for ‘zero’:
         Patterns of type ‘TyRep a’ not matched: TyApp (TyApp _ _) _
diff --git a/testsuite/tests/dependent/should_compile/T11241.stderr b/testsuite/tests/dependent/should_compile/T11241.stderr
index adb78694ba..29d1071b2d 100644
--- a/testsuite/tests/dependent/should_compile/T11241.stderr
+++ b/testsuite/tests/dependent/should_compile/T11241.stderr
@@ -1,5 +1,5 @@
 
-T11241.hs:5:21: warning: [-Wpartial-type-signatures (in -Wdefault)]
+T11241.hs:5:21: warning: [GHC-88464] [-Wpartial-type-signatures (in -Wdefault)]
     • Found type wildcard ‘_’ standing for ‘*’
     • In the kind ‘_’
       In the type signature: foo :: forall (a :: _). a -> a
diff --git a/testsuite/tests/dependent/should_fail/BadTelescope2.stderr b/testsuite/tests/dependent/should_fail/BadTelescope2.stderr
index f5aee5a1eb..7de40e07cb 100644
--- a/testsuite/tests/dependent/should_fail/BadTelescope2.stderr
+++ b/testsuite/tests/dependent/should_fail/BadTelescope2.stderr
@@ -1,5 +1,5 @@
 
-BadTelescope2.hs:9:15: error:
+BadTelescope2.hs:9:15: error: [GHC-97739]
     • These kind and type variables: a k (b :: k)
       are out of dependency order. Perhaps try this ordering:
         k (a :: k) (b :: k)
diff --git a/testsuite/tests/dependent/should_fail/BadTelescope5.stderr b/testsuite/tests/dependent/should_fail/BadTelescope5.stderr
index b5e4ce9c3a..242768822f 100644
--- a/testsuite/tests/dependent/should_fail/BadTelescope5.stderr
+++ b/testsuite/tests/dependent/should_fail/BadTelescope5.stderr
@@ -1,5 +1,5 @@
 
-BadTelescope5.hs:10:81: error:
+BadTelescope5.hs:10:81: error: [GHC-25897]
     • Expected kind ‘k’, but ‘d’ has kind ‘Proxy a’
       ‘k’ is a rigid type variable bound by
         the type signature for ‘bar’
diff --git a/testsuite/tests/dependent/should_fail/DepFail1.stderr b/testsuite/tests/dependent/should_fail/DepFail1.stderr
index 0201005943..c84b1310f5 100644
--- a/testsuite/tests/dependent/should_fail/DepFail1.stderr
+++ b/testsuite/tests/dependent/should_fail/DepFail1.stderr
@@ -1,10 +1,10 @@
 
-DepFail1.hs:7:6: error:
+DepFail1.hs:7:6: error: [GHC-83865]
     • Expecting one more argument to ‘Proxy Bool’
       Expected a type, but ‘Proxy Bool’ has kind ‘Bool -> *’
     • In the type signature: z :: Proxy Bool
 
-DepFail1.hs:10:16: error:
+DepFail1.hs:10:16: error: [GHC-83865]
     • Expected kind ‘Int’, but ‘Bool’ has kind ‘*’
     • In the second argument of ‘Proxy’, namely ‘Bool’
       In the type signature: a :: Proxy Int Bool
diff --git a/testsuite/tests/dependent/should_fail/PromotedClass.stderr b/testsuite/tests/dependent/should_fail/PromotedClass.stderr
index 9f8d84a410..b02e234838 100644
--- a/testsuite/tests/dependent/should_fail/PromotedClass.stderr
+++ b/testsuite/tests/dependent/should_fail/PromotedClass.stderr
@@ -1,5 +1,5 @@
 
-PromotedClass.hs:10:15: error:
+PromotedClass.hs:10:15: error: [GHC-88634]
     • Data constructor ‘MkX’ cannot be used here
         (it has an unpromotable context ‘Show a’)
     • In the first argument of ‘Proxy’, namely ‘('MkX 'True)’
diff --git a/testsuite/tests/dependent/should_fail/RAE_T32a.stderr b/testsuite/tests/dependent/should_fail/RAE_T32a.stderr
index 90c3cd671a..2a38e16ce6 100644
--- a/testsuite/tests/dependent/should_fail/RAE_T32a.stderr
+++ b/testsuite/tests/dependent/should_fail/RAE_T32a.stderr
@@ -1,9 +1,9 @@
 
-RAE_T32a.hs:29:1: error:
+RAE_T32a.hs:29:1: error: [GHC-83865]
     • Expected kind ‘k -> *’, but ‘Sing Sigma (Sigma p r)’ has kind ‘*’
     • In the data instance declaration for ‘Sing’
 
-RAE_T32a.hs:29:20: error:
+RAE_T32a.hs:29:20: error: [GHC-83865]
     • Expecting two more arguments to ‘Sigma’
       Expected a type, but
       ‘Sigma’ has kind
@@ -11,7 +11,7 @@ RAE_T32a.hs:29:20: error:
     • In the first argument of ‘Sing’, namely ‘Sigma’
       In the data instance declaration for ‘Sing’
 
-RAE_T32a.hs:29:27: error:
+RAE_T32a.hs:29:27: error: [GHC-83865]
     • Expected kind ‘Sigma’, but ‘Sigma p r’ has kind ‘*’
     • In the second argument of ‘Sing’, namely ‘(Sigma p r)’
       In the data instance declaration for ‘Sing’
diff --git a/testsuite/tests/dependent/should_fail/RenamingStar.stderr b/testsuite/tests/dependent/should_fail/RenamingStar.stderr
index a0f0bbbab0..50603d602d 100644
--- a/testsuite/tests/dependent/should_fail/RenamingStar.stderr
+++ b/testsuite/tests/dependent/should_fail/RenamingStar.stderr
@@ -1,5 +1,5 @@
 
-RenamingStar.hs:5:13: error:
+RenamingStar.hs:5:13: error: [GHC-24180]
     Operator applied to too few arguments: *
     Suggested fix:
       Use ‘Type’ from ‘Data.Kind’ instead.
diff --git a/testsuite/tests/dependent/should_fail/SelfDep.stderr b/testsuite/tests/dependent/should_fail/SelfDep.stderr
index 3c90f5444b..33dd608047 100644
--- a/testsuite/tests/dependent/should_fail/SelfDep.stderr
+++ b/testsuite/tests/dependent/should_fail/SelfDep.stderr
@@ -1,5 +1,5 @@
 
-SelfDep.hs:5:11: error:
+SelfDep.hs:5:11: error: [GHC-88634]
     • Type constructor ‘T’ cannot be used here
         (it is defined and used in the same recursive group)
     • In the kind ‘T -> *’
diff --git a/testsuite/tests/dependent/should_fail/T11407.stderr b/testsuite/tests/dependent/should_fail/T11407.stderr
index b24559ea9a..667c779d47 100644
--- a/testsuite/tests/dependent/should_fail/T11407.stderr
+++ b/testsuite/tests/dependent/should_fail/T11407.stderr
@@ -1,5 +1,5 @@
 
-T11407.hs:10:40: error:
+T11407.hs:10:40: error: [GHC-25897]
     • Expected kind ‘x a’, but ‘a’ has kind ‘k’
       ‘k’ is a rigid type variable bound by
         a family instance declaration
diff --git a/testsuite/tests/dependent/should_fail/T11471.stderr b/testsuite/tests/dependent/should_fail/T11471.stderr
index 30bab29f4b..c0292270cc 100644
--- a/testsuite/tests/dependent/should_fail/T11471.stderr
+++ b/testsuite/tests/dependent/should_fail/T11471.stderr
@@ -1,5 +1,5 @@
 
-T11471.hs:15:10: error:
+T11471.hs:15:10: error: [GHC-18872]
     • Couldn't match a lifted type with an unlifted type
       When matching types
         a :: *
diff --git a/testsuite/tests/dependent/should_fail/T12081.stderr b/testsuite/tests/dependent/should_fail/T12081.stderr
index e8f25ba354..ac405a73c5 100644
--- a/testsuite/tests/dependent/should_fail/T12081.stderr
+++ b/testsuite/tests/dependent/should_fail/T12081.stderr
@@ -1,5 +1,5 @@
 
-T12081.hs:9:14: error:
+T12081.hs:9:14: error: [GHC-83865]
     • Expected a type, but ‘T n’ has kind ‘Nat’
     • In the kind ‘T n’
       In the type signature: f :: (a :: T n)
diff --git a/testsuite/tests/dependent/should_fail/T13135.stderr b/testsuite/tests/dependent/should_fail/T13135.stderr
index fc70907e11..5e79a4946b 100644
--- a/testsuite/tests/dependent/should_fail/T13135.stderr
+++ b/testsuite/tests/dependent/should_fail/T13135.stderr
@@ -1,5 +1,5 @@
 
-T13135.hs:60:10: error:
+T13135.hs:60:10: error: [GHC-39999]
     • No instance for ‘Constr :<: Constr’
         arising from a use of ‘smartSym’
     • In the expression: smartSym sym
diff --git a/testsuite/tests/dependent/should_fail/T13135_simple.stderr b/testsuite/tests/dependent/should_fail/T13135_simple.stderr
index 52b1e848c0..68f5dd3e30 100644
--- a/testsuite/tests/dependent/should_fail/T13135_simple.stderr
+++ b/testsuite/tests/dependent/should_fail/T13135_simple.stderr
@@ -1,8 +1,8 @@
 
-T13135_simple.hs:34:11: error:
+T13135_simple.hs:34:11: error: [GHC-83865]
     • Couldn't match type ‘SmartFun sig’ with ‘Bool’
       Expected: Int -> Bool
         Actual: SmartFun ('SigFun Int sig)
-      The type variable ‘sig’ is ambiguous
+        The type variable ‘sig’ is ambiguous
     • In the expression: smartSym
       In an equation for ‘problem’: problem = smartSym
diff --git a/testsuite/tests/dependent/should_fail/T13601.stderr b/testsuite/tests/dependent/should_fail/T13601.stderr
index 269dd00b20..695463c080 100644
--- a/testsuite/tests/dependent/should_fail/T13601.stderr
+++ b/testsuite/tests/dependent/should_fail/T13601.stderr
@@ -1,5 +1,5 @@
 
-T13601.hs:19:16: error:
+T13601.hs:19:16: error: [GHC-83865]
     • Expected a type, but ‘Logic a’ has kind ‘TYPE (Rep rep)’
     • In the first argument of ‘Boolean’, namely ‘(Logic a)’
       In the class declaration for ‘Eq’
diff --git a/testsuite/tests/dependent/should_fail/T13780a.stderr b/testsuite/tests/dependent/should_fail/T13780a.stderr
index 6cdcf96369..35ec45a24b 100644
--- a/testsuite/tests/dependent/should_fail/T13780a.stderr
+++ b/testsuite/tests/dependent/should_fail/T13780a.stderr
@@ -1,5 +1,5 @@
 
-T13780a.hs:9:40: error:
+T13780a.hs:9:40: error: [GHC-25897]
     • Couldn't match kind ‘a’ with ‘Bool’
       Expected kind ‘Foo a’, but ‘MkFoo’ has kind ‘Foo Bool’
       ‘a’ is a rigid type variable bound by
diff --git a/testsuite/tests/dependent/should_fail/T13780c.stderr b/testsuite/tests/dependent/should_fail/T13780c.stderr
index 2cdb59ad1e..15e3d7e0c7 100644
--- a/testsuite/tests/dependent/should_fail/T13780c.stderr
+++ b/testsuite/tests/dependent/should_fail/T13780c.stderr
@@ -1,13 +1,13 @@
 [1 of 2] Compiling T13780b          ( T13780b.hs, T13780b.o )
 [2 of 2] Compiling T13780c          ( T13780c.hs, T13780c.o )
 
-T13780c.hs:12:16: error:
+T13780c.hs:12:16: error: [GHC-88634]
     • Data constructor ‘SFalse’ cannot be used here
         (it comes from a data family instance)
     • In the third argument of ‘ElimBool’, namely ‘SFalse’
       In the type family declaration for ‘ElimBool’
 
-T13780c.hs:13:16: error:
+T13780c.hs:13:16: error: [GHC-88634]
     • Data constructor ‘STrue’ cannot be used here
         (it comes from a data family instance)
     • In the third argument of ‘ElimBool’, namely ‘STrue’
diff --git a/testsuite/tests/dependent/should_fail/T13895.stderr b/testsuite/tests/dependent/should_fail/T13895.stderr
index 5ab651fe0b..0039fb2151 100644
--- a/testsuite/tests/dependent/should_fail/T13895.stderr
+++ b/testsuite/tests/dependent/should_fail/T13895.stderr
@@ -1,9 +1,8 @@
 
-T13895.hs:11:14: error:
+T13895.hs:11:14: error: [GHC-01259]
     • Illegal constraint in a kind: forall k. Typeable k => k -> *
     • In the type signature:
-        dataCast1 :: forall (a :: Type).
-                     Data a =>
-                     forall (c :: Type -> Type)
-                            (t :: forall (k :: Type). Typeable k => k -> Type).
-                     Typeable t => (forall d. Data d => c (t d)) -> Maybe (c a)
+        dataCast1 :: forall (a :: Type). Data a =>
+                                         forall (c :: Type -> Type)
+                                                (t :: forall (k :: Type). Typeable k => k -> Type).
+                                         Typeable t => (forall d. Data d => c (t d)) -> Maybe (c a)
diff --git a/testsuite/tests/dependent/should_fail/T14066.stderr b/testsuite/tests/dependent/should_fail/T14066.stderr
index 20c82215ed..2d3d34bb81 100644
--- a/testsuite/tests/dependent/should_fail/T14066.stderr
+++ b/testsuite/tests/dependent/should_fail/T14066.stderr
@@ -1,10 +1,10 @@
 
-T14066.hs:15:59: error:
+T14066.hs:15:59: error: [GHC-46956]
     • Expected kind ‘k0’, but ‘b’ has kind ‘k’
-        because kind variable ‘k’ would escape its scope
-      This (rigid, skolem) kind variable is bound by
-        an explicit forall k (b :: k)
-        at T14066.hs:15:36-45
+    • because kind variable ‘k’ would escape its scope
+    This (rigid, skolem) kind variable is bound by
+      an explicit forall k (b :: k)
+      at T14066.hs:15:36-45
     • In the second argument of ‘SameKind’, namely ‘b’
       In the type signature: g :: forall k (b :: k). SameKind a b
       In the expression:
diff --git a/testsuite/tests/dependent/should_fail/T14066c.stderr b/testsuite/tests/dependent/should_fail/T14066c.stderr
index dc5ba30a4f..4199e6381d 100644
--- a/testsuite/tests/dependent/should_fail/T14066c.stderr
+++ b/testsuite/tests/dependent/should_fail/T14066c.stderr
@@ -1,5 +1,5 @@
 
-T14066c.hs:8:17: error:
+T14066c.hs:8:17: error: [GHC-83865]
     • Expected kind ‘Bool’, but ‘Nothing’ has kind ‘Maybe a0’
     • In the second argument of ‘H’, namely ‘Nothing’
       In the type ‘H True Nothing’
diff --git a/testsuite/tests/dependent/should_fail/T14066d.stderr b/testsuite/tests/dependent/should_fail/T14066d.stderr
index 169897c416..12c4058abf 100644
--- a/testsuite/tests/dependent/should_fail/T14066d.stderr
+++ b/testsuite/tests/dependent/should_fail/T14066d.stderr
@@ -1,5 +1,5 @@
 
-T14066d.hs:11:35: error:
+T14066d.hs:11:35: error: [GHC-25897]
     • Couldn't match type ‘b1’ with ‘b’
       Expected: (Proxy a, Proxy c, b1)
         Actual: (Proxy a, Proxy c, b)
diff --git a/testsuite/tests/dependent/should_fail/T14066e.stderr b/testsuite/tests/dependent/should_fail/T14066e.stderr
index b103b16187..21d74678c3 100644
--- a/testsuite/tests/dependent/should_fail/T14066e.stderr
+++ b/testsuite/tests/dependent/should_fail/T14066e.stderr
@@ -1,5 +1,5 @@
 
-T14066e.hs:13:65: error:
+T14066e.hs:13:65: error: [GHC-25897]
     • Expected a type, but ‘c'’ has kind ‘k1’
       ‘k1’ is a rigid type variable bound by
         the type signature for:
diff --git a/testsuite/tests/dependent/should_fail/T14845_fail1.stderr b/testsuite/tests/dependent/should_fail/T14845_fail1.stderr
index c1f1c8605d..90e1ab9d25 100644
--- a/testsuite/tests/dependent/should_fail/T14845_fail1.stderr
+++ b/testsuite/tests/dependent/should_fail/T14845_fail1.stderr
@@ -1,5 +1,5 @@
 
-T14845_fail1.hs:10:13: error:
+T14845_fail1.hs:10:13: error: [GHC-88634]
     • Data constructor ‘S’ cannot be used here
         (it has an unpromotable context ‘cls a’)
     • In the first argument of ‘Foo’, namely ‘(S :: Struct Eq a)’
diff --git a/testsuite/tests/dependent/should_fail/T14845_fail2.stderr b/testsuite/tests/dependent/should_fail/T14845_fail2.stderr
index 55519c582a..3402d2b09c 100644
--- a/testsuite/tests/dependent/should_fail/T14845_fail2.stderr
+++ b/testsuite/tests/dependent/should_fail/T14845_fail2.stderr
@@ -1,5 +1,5 @@
 
-T14845_fail2.hs:15:14: error:
+T14845_fail2.hs:15:14: error: [GHC-88634]
     • Data constructor ‘MkA’ cannot be used here
         (it has an unpromotable context ‘Coercible a Int’)
     • In the first argument of ‘SA’, namely ‘MkA’
diff --git a/testsuite/tests/dependent/should_fail/T15215.stderr b/testsuite/tests/dependent/should_fail/T15215.stderr
index 51119c1e7a..f7a91650d1 100644
--- a/testsuite/tests/dependent/should_fail/T15215.stderr
+++ b/testsuite/tests/dependent/should_fail/T15215.stderr
@@ -1,11 +1,11 @@
 
-T15215.hs:11:3: error:
+T15215.hs:11:3: error: [GHC-80003]
     • Non type-variable argument in the constraint: Show (Maybe a)
     • In the definition of data constructor ‘MkA’
       In the data type declaration for ‘A’
     Suggested fix: Perhaps you intended to use FlexibleContexts
 
-T15215.hs:18:14: error:
+T15215.hs:18:14: error: [GHC-88634]
     • Data constructor ‘MkB’ cannot be used here
         (it has an unpromotable context ‘Show a’)
     • In the first argument of ‘SA’, namely ‘MkB’
diff --git a/testsuite/tests/dependent/should_fail/T15245.stderr b/testsuite/tests/dependent/should_fail/T15245.stderr
index 859fafda8b..533b350de9 100644
--- a/testsuite/tests/dependent/should_fail/T15245.stderr
+++ b/testsuite/tests/dependent/should_fail/T15245.stderr
@@ -1,5 +1,5 @@
 
-T15245.hs:10:24: error:
+T15245.hs:10:24: error: [GHC-88634]
     • Data constructor ‘MkK’ cannot be used here
         (it comes from a data family instance)
     • In the type ‘'MkK’
diff --git a/testsuite/tests/dependent/should_fail/T15264.stderr b/testsuite/tests/dependent/should_fail/T15264.stderr
index 6d5f597823..fedb54c99e 100644
--- a/testsuite/tests/dependent/should_fail/T15264.stderr
+++ b/testsuite/tests/dependent/should_fail/T15264.stderr
@@ -1,6 +1,8 @@
 
-T15264.hs:7:22: error: Not in scope: type variable ‘k’
+T15264.hs:7:22: error: [GHC-76037] Not in scope: type variable ‘k’
 
-T15264.hs:10:22: error: Not in scope: type variable ‘k1’
+T15264.hs:10:22: error: [GHC-76037]
+    Not in scope: type variable ‘k1’
 
-T15264.hs:10:32: error: Not in scope: type variable ‘k2’
+T15264.hs:10:32: error: [GHC-76037]
+    Not in scope: type variable ‘k2’
diff --git a/testsuite/tests/dependent/should_fail/T15308.stderr b/testsuite/tests/dependent/should_fail/T15308.stderr
index 60c02ac31f..f3c6db26f7 100644
--- a/testsuite/tests/dependent/should_fail/T15308.stderr
+++ b/testsuite/tests/dependent/should_fail/T15308.stderr
@@ -1,5 +1,5 @@
 
-T15308.hs:13:5: error:
+T15308.hs:13:5: error: [GHC-39999]
     • No instance for ‘Show (Foo a f)’ arising from a use of ‘show’
     • In the expression: show
       In an equation for ‘f’: f = show
diff --git a/testsuite/tests/dependent/should_fail/T15343.stderr b/testsuite/tests/dependent/should_fail/T15343.stderr
index d3067812d2..b86523fa42 100644
--- a/testsuite/tests/dependent/should_fail/T15343.stderr
+++ b/testsuite/tests/dependent/should_fail/T15343.stderr
@@ -1,5 +1,5 @@
 
-T15343.hs:15:18: error:
+T15343.hs:15:18: error: [GHC-83865]
     • Expecting one more argument to ‘WhySym’
       Expected kind ‘forall z. z’, but ‘WhySym’ has kind ‘* -> *’
     • In the type ‘WhySym’
diff --git a/testsuite/tests/dependent/should_fail/T15380.stderr b/testsuite/tests/dependent/should_fail/T15380.stderr
index bf0355b01b..429a996e13 100644
--- a/testsuite/tests/dependent/should_fail/T15380.stderr
+++ b/testsuite/tests/dependent/should_fail/T15380.stderr
@@ -1,5 +1,5 @@
 
-T15380.hs:18:16: error:
+T15380.hs:18:16: error: [GHC-83865]
     • Expecting one more argument to ‘To (M x)’
       Expected a type, but ‘To (M x)’ has kind ‘Rep (M x) -> M x’
     • In the type ‘To (M x)’
diff --git a/testsuite/tests/dependent/should_fail/T15859.stderr b/testsuite/tests/dependent/should_fail/T15859.stderr
index 9779cb5f1a..30b24b1206 100644
--- a/testsuite/tests/dependent/should_fail/T15859.stderr
+++ b/testsuite/tests/dependent/should_fail/T15859.stderr
@@ -1,5 +1,5 @@
 
-T15859.hs:9:19: error:
+T15859.hs:9:19: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall k -> k -> *
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T15859a.stderr b/testsuite/tests/dependent/should_fail/T15859a.stderr
index 2d04f8d1fa..13db6890a4 100644
--- a/testsuite/tests/dependent/should_fail/T15859a.stderr
+++ b/testsuite/tests/dependent/should_fail/T15859a.stderr
@@ -1,7 +1,7 @@
 
-T15859a.hs:19:26: error:
+T15859a.hs:19:26: error: [GHC-91028]
     • Expected kind ‘k0’, but ‘A’ has kind ‘forall k -> k -> *’
-    • Cannot instantiate unification variable ‘k0’
+      Cannot instantiate unification variable ‘k0’
       with a kind involving polytypes: forall k -> k -> *
     • In the first argument of ‘KindOf’, namely ‘A’
       In an expression type signature: KindOf A
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail1.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail1.stderr
index c56bd105db..da66f380c2 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail1.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail1.stderr
@@ -1,11 +1,11 @@
 
-T16326_Fail1.hs:5:8: error:
+T16326_Fail1.hs:5:8: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a -> a -> a
       (GHC does not yet support this)
     • In the type signature: id1 :: forall a -> a -> a
 
-T16326_Fail1.hs:9:8: error:
+T16326_Fail1.hs:9:8: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a -> a -> a
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail10.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail10.stderr
index 44a0d34a33..3c0ce349b9 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail10.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail10.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail10.hs:12:18: error:
+T16326_Fail10.hs:12:18: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a -> a -> a
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail11.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail11.stderr
index 396010dbd7..f96814d281 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail11.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail11.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail11.hs:9:11: error:
+T16326_Fail11.hs:9:11: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall x -> x
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail12.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail12.stderr
index 30b35de4f7..91044c0577 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail12.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail12.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail12.hs:6:1: error:
+T16326_Fail12.hs:6:1: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a -> Show a
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail2.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail2.stderr
index 3e3f0c1128..1e991a28ba 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail2.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail2.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail2.hs:6:37: error:
+T16326_Fail2.hs:6:37: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a -> a -> IO ()
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail3.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail3.stderr
index 27ed998b45..e7990218ec 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail3.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail3.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail3.hs:6:1: error:
+T16326_Fail3.hs:6:1: error: [GHC-51580]
     Illegal visible, dependent quantification in the type of a term:
       forall a -> [a]
     (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail4.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail4.stderr
index 258fc08607..5039c07f89 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail4.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail4.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail4.hs:6:30: error:
+T16326_Fail4.hs:6:30: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a1 -> Maybe a1 -> Maybe a1 -> Maybe a1
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail5.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail5.stderr
index 59c27c2464..ba84b8a21a 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail5.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail5.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail5.hs:7:20: error:
+T16326_Fail5.hs:7:20: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a1 -> Maybe a1
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail7.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail7.stderr
index edb1c1c8f5..0380d29e72 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail7.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail7.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail7.hs:9:13: error:
+T16326_Fail7.hs:9:13: error: [GHC-25955]
     Illegal symbol ‘forall’ in type
     Suggested fix:
       Perhaps you intended to use RankNTypes
diff --git a/testsuite/tests/dependent/should_fail/T16326_Fail9.stderr b/testsuite/tests/dependent/should_fail/T16326_Fail9.stderr
index 3ad4e754a9..29afc29d93 100644
--- a/testsuite/tests/dependent/should_fail/T16326_Fail9.stderr
+++ b/testsuite/tests/dependent/should_fail/T16326_Fail9.stderr
@@ -1,5 +1,5 @@
 
-T16326_Fail9.hs:11:5: error:
+T16326_Fail9.hs:11:5: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a -> a -> a
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/T16344.stderr b/testsuite/tests/dependent/should_fail/T16344.stderr
index d567defeee..5081549afd 100644
--- a/testsuite/tests/dependent/should_fail/T16344.stderr
+++ b/testsuite/tests/dependent/should_fail/T16344.stderr
@@ -1,5 +1,5 @@
 
-T16344.hs:7:46: error:
+T16344.hs:7:46: error: [GHC-25897]
     • Expected kind ‘ka’, but ‘Int’ has kind ‘*’
     • In the second argument of ‘T’, namely ‘Int’
       In the type ‘(T Type Int Bool)’
diff --git a/testsuite/tests/dependent/should_fail/T16344a.stderr b/testsuite/tests/dependent/should_fail/T16344a.stderr
index ab3b991293..e31d7b0a22 100644
--- a/testsuite/tests/dependent/should_fail/T16344a.stderr
+++ b/testsuite/tests/dependent/should_fail/T16344a.stderr
@@ -1,5 +1,5 @@
 
-T16344a.hs:11:36: error:
+T16344a.hs:11:36: error: [GHC-25897]
     • Expected a type, but ‘a’ has kind ‘ka’
       ‘ka’ is a rigid type variable bound by
         the data type declaration for ‘T2’
diff --git a/testsuite/tests/dependent/should_fail/T16391b.stderr b/testsuite/tests/dependent/should_fail/T16391b.stderr
index 2209886a89..201adffc25 100644
--- a/testsuite/tests/dependent/should_fail/T16391b.stderr
+++ b/testsuite/tests/dependent/should_fail/T16391b.stderr
@@ -1,5 +1,5 @@
 
-T16391b.hs:10:8: error:
+T16391b.hs:10:8: error: [GHC-25897]
     • Expected a type, but ‘T r’ has kind ‘TYPE r’
       ‘r’ is a rigid type variable bound by
         the type signature for ‘foo’
diff --git a/testsuite/tests/dependent/should_fail/T16418.stderr b/testsuite/tests/dependent/should_fail/T16418.stderr
index a286d77805..5b5f66d577 100644
--- a/testsuite/tests/dependent/should_fail/T16418.stderr
+++ b/testsuite/tests/dependent/should_fail/T16418.stderr
@@ -1,5 +1,5 @@
 
-T16418.hs:9:13: error:
+T16418.hs:9:13: error: [GHC-97739]
     • These kind and type variables: a k (b :: k)
       are out of dependency order. Perhaps try this ordering:
         k (a :: k) (b :: k)
diff --git a/testsuite/tests/dependent/should_fail/T17131.stderr b/testsuite/tests/dependent/should_fail/T17131.stderr
index 3ab5c50665..3bc040f45b 100644
--- a/testsuite/tests/dependent/should_fail/T17131.stderr
+++ b/testsuite/tests/dependent/should_fail/T17131.stderr
@@ -1,10 +1,10 @@
 
-T17131.hs:12:34: error:
+T17131.hs:12:34: error: [GHC-83865]
     • Couldn't match kind: TypeReps xs
                      with: '[LiftedRep]
       Expected kind ‘TYPE ('TupleRep (TypeReps xs))’,
         but ‘(# a #)’ has kind ‘TYPE ('TupleRep '[LiftedRep])’
-      The type variable ‘xs’ is ambiguous
+        The type variable ‘xs’ is ambiguous
     • In the type ‘(# a #)’
       In the type family declaration for ‘Tuple#’
       NB: Type ‘Tuple#’ was inferred to use visible dependent quantification.
diff --git a/testsuite/tests/dependent/should_fail/T17541.stderr b/testsuite/tests/dependent/should_fail/T17541.stderr
index 2321aee6ed..ed30993549 100644
--- a/testsuite/tests/dependent/should_fail/T17541.stderr
+++ b/testsuite/tests/dependent/should_fail/T17541.stderr
@@ -1,8 +1,8 @@
 
-T17541.hs:19:17: error:
+T17541.hs:19:17: error: [GHC-83865]
     • Couldn't match kind ‘Rep rep’ with ‘'IntRep’
       Expected kind ‘TYPE (Rep rep)’, but ‘Int#’ has kind ‘TYPE 'IntRep’
-      The type variable ‘rep’ is ambiguous
+        The type variable ‘rep’ is ambiguous
     • In the type ‘Int#’
       In the type family declaration for ‘Unboxed’
       NB: Type ‘Unboxed’ was inferred to use visible dependent quantification.
diff --git a/testsuite/tests/dependent/should_fail/T17541b.stderr b/testsuite/tests/dependent/should_fail/T17541b.stderr
index 7502f21373..f0b952c679 100644
--- a/testsuite/tests/dependent/should_fail/T17541b.stderr
+++ b/testsuite/tests/dependent/should_fail/T17541b.stderr
@@ -1,5 +1,5 @@
 
-T17541b.hs:8:20: error:
+T17541b.hs:8:20: error: [GHC-25897]
     • Expected kind ‘k’, but ‘Int’ has kind ‘*’
     • In the second argument of ‘T’, namely ‘Int’
       In the type ‘T Type Int’
diff --git a/testsuite/tests/dependent/should_fail/T17687.stderr b/testsuite/tests/dependent/should_fail/T17687.stderr
index e4ac034f93..03d9106e1d 100644
--- a/testsuite/tests/dependent/should_fail/T17687.stderr
+++ b/testsuite/tests/dependent/should_fail/T17687.stderr
@@ -1,5 +1,5 @@
 
-T17687.hs:5:6: error:
+T17687.hs:5:6: error: [GHC-51580]
     • Illegal visible, dependent quantification in the type of a term:
         forall a -> a -> a
       (GHC does not yet support this)
diff --git a/testsuite/tests/dependent/should_fail/TypeSkolEscape.stderr b/testsuite/tests/dependent/should_fail/TypeSkolEscape.stderr
index b8ccbdfc9f..8020f53979 100644
--- a/testsuite/tests/dependent/should_fail/TypeSkolEscape.stderr
+++ b/testsuite/tests/dependent/should_fail/TypeSkolEscape.stderr
@@ -1,9 +1,9 @@
 
-TypeSkolEscape.hs:9:52: error:
+TypeSkolEscape.hs:9:52: error: [GHC-46956]
     • Expected kind ‘k0’, but ‘a’ has kind ‘TYPE v’
-        because kind variable ‘v’ would escape its scope
-      This (rigid, skolem) kind variable is bound by
-        an explicit forall (v :: RuntimeRep) (a :: TYPE v)
-        at TypeSkolEscape.hs:9:19-49
+    • because kind variable ‘v’ would escape its scope
+    This (rigid, skolem) kind variable is bound by
+      an explicit forall (v :: RuntimeRep) (a :: TYPE v)
+      at TypeSkolEscape.hs:9:19-49
     • In the type ‘forall (v :: RuntimeRep) (a :: TYPE v). a’
       In the type declaration for ‘Bad’