16 files changed, 26 insertions, 26 deletions
diff --git a/testsuite/tests/arrows/gadt/ArrowDict.stderr b/testsuite/tests/arrows/gadt/ArrowDict.stderr
index 7e18ba340a..4fef58440f 100644
--- a/testsuite/tests/arrows/gadt/ArrowDict.stderr
+++ b/testsuite/tests/arrows/gadt/ArrowDict.stderr
@@ -1,5 +1,5 @@
 
-ArrowDict.hs:8:13: error:
+ArrowDict.hs:8:13: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: D x
       In the expression: proc (D x) -> do show -< x
diff --git a/testsuite/tests/arrows/gadt/ArrowExistential.stderr b/testsuite/tests/arrows/gadt/ArrowExistential.stderr
index 00944f1297..4b700ca468 100644
--- a/testsuite/tests/arrows/gadt/ArrowExistential.stderr
+++ b/testsuite/tests/arrows/gadt/ArrowExistential.stderr
@@ -1,5 +1,5 @@
 
-ArrowExistential.hs:16:27: error:
+ArrowExistential.hs:16:27: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: Bar a
       In a case alternative within arrow notation: Bar a -> foo -< a
diff --git a/testsuite/tests/arrows/gadt/ArrowGADTKappa.stderr b/testsuite/tests/arrows/gadt/ArrowGADTKappa.stderr
index e9b21a297f..9783bcc18d 100644
--- a/testsuite/tests/arrows/gadt/ArrowGADTKappa.stderr
+++ b/testsuite/tests/arrows/gadt/ArrowGADTKappa.stderr
@@ -1,5 +1,5 @@
 
-ArrowGADTKappa.hs:17:26: error:
+ArrowGADTKappa.hs:17:26: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: MkG g
       In an arrow kappa abstraction: \ (MkG g) -> show -< g
diff --git a/testsuite/tests/arrows/gadt/ArrowPatSyn1.stderr b/testsuite/tests/arrows/gadt/ArrowPatSyn1.stderr
index 5c11f98a3f..5913393594 100644
--- a/testsuite/tests/arrows/gadt/ArrowPatSyn1.stderr
+++ b/testsuite/tests/arrows/gadt/ArrowPatSyn1.stderr
@@ -1,5 +1,5 @@
 
-ArrowPatSyn1.hs:16:15: error:
+ArrowPatSyn1.hs:16:15: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: P x
       In the expression: proc (P x) -> show -< x
diff --git a/testsuite/tests/arrows/gadt/ArrowPatSyn2.stderr b/testsuite/tests/arrows/gadt/ArrowPatSyn2.stderr
index 6274097ded..4f862e9121 100644
--- a/testsuite/tests/arrows/gadt/ArrowPatSyn2.stderr
+++ b/testsuite/tests/arrows/gadt/ArrowPatSyn2.stderr
@@ -1,5 +1,5 @@
 
-ArrowPatSyn2.hs:16:15: error:
+ArrowPatSyn2.hs:16:15: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: P x
       In the expression: proc (P x) -> MkT -< x
diff --git a/testsuite/tests/arrows/gadt/T17423.stderr b/testsuite/tests/arrows/gadt/T17423.stderr
index 8e8cf00c9d..44ab0e56d0 100644
--- a/testsuite/tests/arrows/gadt/T17423.stderr
+++ b/testsuite/tests/arrows/gadt/T17423.stderr
@@ -1,5 +1,5 @@
 
-T17423.hs:19:13: error:
+T17423.hs:19:13: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: DecoBool i c
       In the expression:
diff --git a/testsuite/tests/arrows/gadt/T20469.stderr b/testsuite/tests/arrows/gadt/T20469.stderr
index 719f43db20..7a08e9aa16 100644
--- a/testsuite/tests/arrows/gadt/T20469.stderr
+++ b/testsuite/tests/arrows/gadt/T20469.stderr
@@ -1,5 +1,5 @@
 
-T20469.hs:8:13: error:
+T20469.hs:8:13: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: D
       In the pattern: (D, x)
diff --git a/testsuite/tests/arrows/gadt/T20470.stderr b/testsuite/tests/arrows/gadt/T20470.stderr
index 761c7d1446..0380fd3441 100644
--- a/testsuite/tests/arrows/gadt/T20470.stderr
+++ b/testsuite/tests/arrows/gadt/T20470.stderr
@@ -1,5 +1,5 @@
 
-T20470.hs:12:5: error:
+T20470.hs:12:5: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: A x B
       In a case alternative within arrow notation: A x B -> id -< x
diff --git a/testsuite/tests/arrows/gadt/T5777.stderr b/testsuite/tests/arrows/gadt/T5777.stderr
index 614b829896..3a65e68164 100644
--- a/testsuite/tests/arrows/gadt/T5777.stderr
+++ b/testsuite/tests/arrows/gadt/T5777.stderr
@@ -1,5 +1,5 @@
 
-T5777.hs:13:18: error:
+T5777.hs:13:18: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: BoolVal
       In the expression: proc BoolVal -> returnA -< ()
diff --git a/testsuite/tests/arrows/gadt/T9985.stderr b/testsuite/tests/arrows/gadt/T9985.stderr
index add3f3c67b..5884c5d1aa 100644
--- a/testsuite/tests/arrows/gadt/T9985.stderr
+++ b/testsuite/tests/arrows/gadt/T9985.stderr
@@ -1,5 +1,5 @@
 
-T9985.hs:29:18: error:
+T9985.hs:29:18: error: [GHC-64525]
     • Proc patterns cannot use existential or GADT data constructors
     • In the pattern: VNil
       In the pattern: a :> VNil
diff --git a/testsuite/tests/arrows/should_fail/T20768_arrow_fail.stderr b/testsuite/tests/arrows/should_fail/T20768_arrow_fail.stderr
index 43be5c220c..7c6f75cba2 100644
--- a/testsuite/tests/arrows/should_fail/T20768_arrow_fail.stderr
+++ b/testsuite/tests/arrows/should_fail/T20768_arrow_fail.stderr
@@ -1,5 +1,5 @@
 
-T20768_arrow_fail.hs:9:10: error:
+T20768_arrow_fail.hs:9:10: error: [GHC-91938]
     • \cases alternatives within arrow notation have different numbers of arguments
         T20768_arrow_fail.hs:10:6-54
         T20768_arrow_fail.hs:12:6-25
@@ -19,7 +19,7 @@ T20768_arrow_fail.hs:9:10: error:
                                -> returnA -< "none") |)
                         x
 
-T20768_arrow_fail.hs:17:9: error:
+T20768_arrow_fail.hs:17:9: error: [GHC-39999]
     • Could not deduce ‘ArrowChoice p’ arising from an arrow command
       from the context: Arrow p
         bound by the type signature for:
@@ -51,7 +51,7 @@ T20768_arrow_fail.hs:17:9: error:
                          Nothing -> returnA -< "none") |)
                     x
 
-T20768_arrow_fail.hs:26:21: error:
+T20768_arrow_fail.hs:26:21: error: [GHC-39999]
     • Could not deduce ‘Num (Maybe Int)’ arising from the literal ‘100’
       from the context: ArrowChoice p
         bound by the type signature for:
diff --git a/testsuite/tests/arrows/should_fail/T2111.stderr b/testsuite/tests/arrows/should_fail/T2111.stderr
index 4d100b3094..36c0de8fbe 100644
--- a/testsuite/tests/arrows/should_fail/T2111.stderr
+++ b/testsuite/tests/arrows/should_fail/T2111.stderr
@@ -1,8 +1,8 @@
 
-T2111.hs:6:23:
+T2111.hs:6:23: error: [GHC-66043]
     Arrow command found where an expression was expected:
       undefined -< x
 
-T2111.hs:6:41:
+T2111.hs:6:41: error: [GHC-66043]
     Arrow command found where an expression was expected:
       undefined -< x
diff --git a/testsuite/tests/arrows/should_fail/T5380.stderr b/testsuite/tests/arrows/should_fail/T5380.stderr
index a116513014..6e01847511 100644
--- a/testsuite/tests/arrows/should_fail/T5380.stderr
+++ b/testsuite/tests/arrows/should_fail/T5380.stderr
@@ -1,5 +1,5 @@
 
-T5380.hs:7:27: error:
+T5380.hs:7:27: error: [GHC-25897]
     • Couldn't match expected type ‘Bool’ with actual type ‘not_bool’
       ‘not_bool’ is a rigid type variable bound by
         the type signature for:
@@ -15,7 +15,7 @@ T5380.hs:7:27: error:
         testB :: not_bool -> (() -> ()) -> () -> not_unit
           (bound at T5380.hs:7:1)
 
-T5380.hs:7:34: error:
+T5380.hs:7:34: error: [GHC-25897]
     • Couldn't match type ‘not_unit’ with ‘()’
       Expected: () -> not_unit
         Actual: () -> ()
diff --git a/testsuite/tests/arrows/should_fail/arrowfail002.stderr b/testsuite/tests/arrows/should_fail/arrowfail002.stderr
index 2bb46b971c..a768e4f14b 100644
--- a/testsuite/tests/arrows/should_fail/arrowfail002.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail002.stderr
@@ -1,2 +1,3 @@
 
-arrowfail002.hs:6:17: error: Variable not in scope: x :: Int
+arrowfail002.hs:6:17: error: [GHC-88464]
+    Variable not in scope: x :: Int
diff --git a/testsuite/tests/arrows/should_fail/arrowfail003.stderr b/testsuite/tests/arrows/should_fail/arrowfail003.stderr
index 25e8efd0b1..02fe1a4572 100644
--- a/testsuite/tests/arrows/should_fail/arrowfail003.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail003.stderr
@@ -1,8 +1,8 @@
 
-arrowfail003.hs:8:7:
+arrowfail003.hs:8:7: error: [GHC-66043]
     Arrow command found where an expression was expected:
       returnA -< []
 
-arrowfail003.hs:9:7:
+arrowfail003.hs:9:7: error: [GHC-66043]
     Arrow command found where an expression was expected:
       (| zeroArrow |)
diff --git a/testsuite/tests/arrows/should_fail/arrowfail004.stderr b/testsuite/tests/arrows/should_fail/arrowfail004.stderr
index e479369554..32f5c0ce3f 100644
--- a/testsuite/tests/arrows/should_fail/arrowfail004.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail004.stderr
@@ -1,7 +1,6 @@
 
-arrowfail004.hs:12:15:
-    Proc patterns cannot use existential or GADT data constructors
-    In the pattern: T x
-    In the expression: proc (T x) -> do returnA -< T x
-    In an equation for ‘panic’:
-        panic = proc (T x) -> do returnA -< T x
+arrowfail004.hs:12:15: error: [GHC-64525]
+    • Proc patterns cannot use existential or GADT data constructors
+    • In the pattern: T x
+      In the expression: proc (T x) -> do returnA -< T x
+      In an equation for ‘panic’: panic = proc (T x) -> do returnA -< T x