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.

80 files changed, 130 insertions, 121 deletions

diff --git a/testsuite/tests/safeHaskell/check/Check01.stderr b/testsuite/tests/safeHaskell/check/Check01.stderr
index b63d8d4a10..3eda379107 100644
--- a/testsuite/tests/safeHaskell/check/Check01.stderr
+++ b/testsuite/tests/safeHaskell/check/Check01.stderr
@@ -1,4 +1,4 @@
 [3 of 3] Compiling Check01          ( Check01.hs, Check01.o )
 
-<no location info>: error:
-    The package (base-4.16.0.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (base-4.17.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/Check06.stderr b/testsuite/tests/safeHaskell/check/Check06.stderr
index b533b3c357..49635306ef 100644
--- a/testsuite/tests/safeHaskell/check/Check06.stderr
+++ b/testsuite/tests/safeHaskell/check/Check06.stderr
@@ -1,5 +1,5 @@
 [1 of 2] Compiling Check06_A        ( Check06_A.hs, Check06_A.o )
 [2 of 2] Compiling Check06          ( Check06.hs, Check06.o )
 
-<no location info>: error:
-    The package (base-4.13.0.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (base-4.17.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/Check08.stderr b/testsuite/tests/safeHaskell/check/Check08.stderr
index 9eb6691bc8..e0fed33756 100644
--- a/testsuite/tests/safeHaskell/check/Check08.stderr
+++ b/testsuite/tests/safeHaskell/check/Check08.stderr
@@ -2,5 +2,5 @@
 [2 of 3] Compiling Check08_B        ( Check08_B.hs, Check08_B.o )
 [3 of 3] Compiling Check08          ( Check08.hs, Check08.o )
 
-<no location info>: error:
-    The package (base-4.16.0.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (base-4.17.0.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/Check09.stderr b/testsuite/tests/safeHaskell/check/Check09.stderr
index 14af3c8f8b..042f2d7adf 100644
--- a/testsuite/tests/safeHaskell/check/Check09.stderr
+++ b/testsuite/tests/safeHaskell/check/Check09.stderr
@@ -1,8 +1,8 @@
 
-Check09.hs:5:1: error:
+Check09.hs:5:1: error: [GHC-75165]
     Prelude: Can't be safely imported!
-    The package (base-4.16.0.0) the module resides in isn't trusted.
+    The package (base-4.17.0.0) the module resides in isn't trusted.
 
-Check09.hs:6:1: error:
+Check09.hs:6:1: error: [GHC-75165]
     Data.ByteString.Char8: Can't be safely imported!
-    The package (bytestring-0.10.12.0) the module resides in isn't trusted.
+    The package (bytestring-0.11.3.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
index 0381edfccb..77783546c9 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
@@ -1,4 +1,4 @@
 
-ImpSafe01.hs:10:1: error:
+ImpSafe01.hs:10:1: error: [GHC-75165]
     Data.Word: Can't be safely imported!
-    The package (base-4.16.0.0) the module resides in isn't trusted.
+    The package (base-4.17.0.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
index 33cb566987..19f6c1c0a1 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
@@ -1,4 +1,4 @@
 [2 of 3] Compiling Main             ( ImpSafe03.hs, ImpSafe03.o )
 
-<no location info>: error:
-    The package (bytestring-0.11.1.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (bytestring-0.11.3.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr
index a0445afd23..d25ba89d1d 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr
@@ -1,4 +1,4 @@
 
-ImpSafe04.hs:10:1: error:
+ImpSafe04.hs:10:1: error: [GHC-75165]
     Data.Word: Can't be safely imported!
-    The package (base-4.16.0.0) the module resides in isn't trusted.
+    The package (base-4.17.0.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
index aef125b2ef..5400ea9ff4 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
@@ -1,4 +1,4 @@
 
-ImpSafeOnly03.hs:5:1: error:
+ImpSafeOnly03.hs:5:1: error: [GHC-75165]
     M_SafePkg3: Can't be safely imported!
     The package (safePkg01-1.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly05.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly05.stderr
index 7e854073bf..cdbb136803 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly05.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly05.stderr
@@ -1,4 +1,4 @@
 
-ImpSafeOnly05.hs:5:1: error:
+ImpSafeOnly05.hs:5:1: error: [GHC-75165]
     M_SafePkg5: Can't be safely imported!
     The package (safePkg01-1.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
index 79af2e0a45..8576745e7c 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
@@ -1,6 +1,6 @@
 
-<no location info>: error:
-    The package (base-4.9.0.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (base-4.17.0.0) is required to be trusted but it isn't!
 
-<no location info>: error:
-    The package (bytestring-0.10.8.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (bytestring-0.11.3.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
index 79af2e0a45..8576745e7c 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
@@ -1,6 +1,6 @@
 
-<no location info>: error:
-    The package (base-4.9.0.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (base-4.17.0.0) is required to be trusted but it isn't!
 
-<no location info>: error:
-    The package (bytestring-0.10.8.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (bytestring-0.11.3.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly09.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly09.stderr
index 4221723abe..e125b95fdb 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly09.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly09.stderr
@@ -1,3 +1,3 @@
 
-<no location info>:
-    The package (bytestring-0.10.8.0) is required to be trusted but it isn't!
+<no location info>: error: [GHC-08674]
+    The package (bytestring-0.11.3.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags03.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags03.stderr
index 0ca3951efa..fa837fa107 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags03.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags03.stderr
@@ -1,2 +1,3 @@
 
-SafeFlags03.hs:1:14: Unsupported extension: SafeImport
+SafeFlags03.hs:1:14: error: [GHC-46537]
+    Unsupported extension: SafeImport
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags04.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags04.stderr
index 2a550f25a1..7b94f9df3e 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags04.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags04.stderr
@@ -1,2 +1,3 @@
 
-SafeFlags04.hs:1:14: Unsupported extension: SafeLanguage
+SafeFlags04.hs:1:14: error: [GHC-46537]
+    Unsupported extension: SafeLanguage
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags07.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags07.stderr
index 3c3317f20c..2310743115 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags07.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags07.stderr
@@ -1,2 +1,3 @@
 
-SafeFlags07.hs:1:14: Unsupported extension: SafeLanguage
+SafeFlags07.hs:1:14: error: [GHC-46537]
+    Unsupported extension: SafeLanguage
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags08.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags08.stderr
index e72e6e459f..4d179b1269 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags08.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags08.stderr
@@ -1,2 +1,3 @@
 
-SafeFlags08.hs:1:14: Unsupported extension: SafeLanguage
+SafeFlags08.hs:1:14: error: [GHC-46537]
+    Unsupported extension: SafeLanguage
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags09.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags09.stderr
index 2bc5aed21c..d7554da817 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags09.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags09.stderr
@@ -1,2 +1,3 @@
 
-SafeFlags09.hs:1:14: Unsupported extension: SafeLanguage
+SafeFlags09.hs:1:14: error: [GHC-46537]
+    Unsupported extension: SafeLanguage
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
index 4ce52ce072..f8a7377058 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
@@ -1,4 +1,4 @@
 
-SafeFlags17.hs:5:8: error:
+SafeFlags17.hs:5:8: error: [GHC-75165]
     Prelude: Can't be safely imported!
-    The package (base-4.16.0.0) the module resides in isn't trusted.
+    The package (base-4.17.0.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags19.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags19.stderr
index 438cd98629..435d6adb9b 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags19.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags19.stderr
@@ -1,3 +1,3 @@
 
-SafeFlags19.hs:1:17:
+SafeFlags19.hs:1:17: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: -fno-package-trust
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags22.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags22.stderr
index cc4d8b7ae1..75547c110a 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags22.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags22.stderr
@@ -2,6 +2,6 @@
 SafeFlags22.hs:2:17: warning: [-Wunsafe]
     ‘SafeFlags22’ has been inferred as unsafe!
     Reason:
-        SafeFlags22.hs:8:1: error:
+        SafeFlags22.hs:8:1: error: [GHC-44360]
             System.IO.Unsafe: Can't be safely imported!
             The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags23.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags23.stderr
index 3bb3d3b02a..28fba4657a 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags23.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags23.stderr
@@ -1,7 +1,7 @@
 
-SafeFlags23.hs:2:17: error: [-Wunsafe, -Werror=unsafe]
+SafeFlags23.hs:2:17: error: [-Wunsafe, Werror=unsafe]
     ‘SafeFlags22’ has been inferred as unsafe!
     Reason:
-        SafeFlags23.hs:8:1: error:
+        SafeFlags23.hs:8:1: error: [GHC-44360]
             System.IO.Unsafe: Can't be safely imported!
             The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags25.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags25.stderr
index 57bcdaa192..ba53b5cd03 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags25.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags25.stderr
@@ -1,3 +1,3 @@
 
-SafeFlags25.hs:2:17: warning: [-Wsafe]
+SafeFlags25.hs:2:17: warning: [GHC-58656] [-Wsafe]
     ‘SafeFlags25’ has been inferred as safe!
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags26.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags26.stderr
index f4b084a9a5..c687be2a56 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags26.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags26.stderr
@@ -1,3 +1,3 @@
 
-SafeFlags26.hs:2:17: error: [-Wsafe, -Werror=safe]
+SafeFlags26.hs:2:17: error: [GHC-58656] [-Wsafe, Werror=safe]
     ‘SafeFlags26’ has been inferred as safe!
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags28.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags28.stderr
index efc47ee4ce..96d2c2062d 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags28.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags28.stderr
@@ -1,12 +1,12 @@
 
-SafeFlags28.hs:1:17: error:
+SafeFlags28.hs:1:17: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: -trust
 
-SafeFlags28.hs:1:24: error:
+SafeFlags28.hs:1:24: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: base,
 
-SafeFlags28.hs:1:30: error:
+SafeFlags28.hs:1:30: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: -trust
 
-SafeFlags28.hs:1:37: error:
+SafeFlags28.hs:1:37: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: bytestring
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags29.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags29.stderr
index a98ac6cf77..fea369aef5 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags29.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags29.stderr
@@ -1,12 +1,12 @@
 
-SafeFlags29.hs:2:17: error:
+SafeFlags29.hs:2:17: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: -trust
 
-SafeFlags29.hs:2:24: error:
+SafeFlags29.hs:2:24: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: base
 
-SafeFlags29.hs:2:29: error:
+SafeFlags29.hs:2:29: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: -trust
 
-SafeFlags29.hs:2:36: error:
+SafeFlags29.hs:2:36: error: [GHC-04924]
     Unknown flag in  {-# OPTIONS_GHC #-} pragma: bytestring
diff --git a/testsuite/tests/safeHaskell/ghci/p10.stderr b/testsuite/tests/safeHaskell/ghci/p10.stderr
index d3c7fe2f5e..89201ec34a 100644
--- a/testsuite/tests/safeHaskell/ghci/p10.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p10.stderr
@@ -1,2 +1,2 @@
 
-<interactive>:10:1: error: Variable not in scope: b
+<interactive>:10:1: error: [GHC-88464] Variable not in scope: b
diff --git a/testsuite/tests/safeHaskell/ghci/p11.stderr b/testsuite/tests/safeHaskell/ghci/p11.stderr
index 9ff951a7bc..adb6f1288e 100644
--- a/testsuite/tests/safeHaskell/ghci/p11.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p11.stderr
@@ -1,4 +1,4 @@
 
-E.hs:3:1:
+E.hs:3:1: error: [GHC-44360]
     System.IO.Unsafe: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/ghci/p12.stderr b/testsuite/tests/safeHaskell/ghci/p12.stderr
index 3b259c3722..a552be6d6c 100644
--- a/testsuite/tests/safeHaskell/ghci/p12.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p12.stderr
@@ -1,7 +1,6 @@
 Some flags have not been recognized: -XNoSafe
 Some flags have not been recognized: -fno-package-trust
 
-<no location info>:
+<no location info>: error: [GHC-75165]
     Data.ByteString: Can't be safely imported!
-    The package (bytestring-0.10.5.0) the module resides in isn't trusted.
-
+    The package (bytestring-0.11.3.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/ghci/p13.stderr b/testsuite/tests/safeHaskell/ghci/p13.stderr
index ba73130146..edc4a9a067 100644
--- a/testsuite/tests/safeHaskell/ghci/p13.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p13.stderr
@@ -1,5 +1,5 @@
 
-<interactive>:11:1: error:
+<interactive>:11:1: error: [GHC-36705]
     • Unsafe overlapping instances for Pos [Int]
         arising from a use of ‘res’
       The matching instance is:
diff --git a/testsuite/tests/safeHaskell/ghci/p14.stderr b/testsuite/tests/safeHaskell/ghci/p14.stderr
index 804526b153..0f6f65975c 100644
--- a/testsuite/tests/safeHaskell/ghci/p14.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p14.stderr
@@ -2,7 +2,7 @@
 when making flags consistent: warning:
     Optimization flags are incompatible with the byte-code interpreter; optimization flags ignored.
 
-<interactive>:10:25: error:
+<interactive>:10:25: error: [GHC-39999]
     • No instance for ‘Num a’ arising from a use of ‘f’
       Possible fix: add (Num a) to the context of the RULE "id/Int"
     • In the expression: f
diff --git a/testsuite/tests/safeHaskell/ghci/p16.stderr b/testsuite/tests/safeHaskell/ghci/p16.stderr
index 357bc5bc9f..f915af1f1b 100644
--- a/testsuite/tests/safeHaskell/ghci/p16.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p16.stderr
@@ -2,7 +2,7 @@
 <no location info>: warning:
     -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving
 
-<interactive>:16:29: error:
+<interactive>:16:29: error: [GHC-82023]
     • Can't make a derived instance of ‘Op T2’:
         ‘Op’ is not a stock derivable class (Eq, Show, etc.)
     • In the newtype declaration for ‘T2’
@@ -10,8 +10,8 @@
       Perhaps you intended to use GeneralizedNewtypeDeriving
       for GHC's newtype-deriving extension
 
-<interactive>:19:9: error:
+<interactive>:19:9: error: [GHC-88464]
     Data constructor not in scope: T2 :: T -> t
     Suggested fix: Perhaps use ‘T1’ (line 13)
 
-<interactive>:22:4: error: Variable not in scope: y
+<interactive>:22:4: error: [GHC-88464] Variable not in scope: y
diff --git a/testsuite/tests/safeHaskell/ghci/p17.stderr b/testsuite/tests/safeHaskell/ghci/p17.stderr
index c46be207c3..9c56e1256d 100644
--- a/testsuite/tests/safeHaskell/ghci/p17.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p17.stderr
@@ -1,5 +1,4 @@
 
-<no location info>:
+<no location info>: error: [GHC-75165]
     Data.ByteString: Can't be safely imported!
-    The package (bytestring-0.10.1.0) the module resides in isn't trusted.
-
+    The package (bytestring-0.11.3.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/ghci/p3.stderr b/testsuite/tests/safeHaskell/ghci/p3.stderr
index 9ff390705c..59413e8888 100644
--- a/testsuite/tests/safeHaskell/ghci/p3.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p3.stderr
@@ -1,10 +1,8 @@
 
-<no location info>:
+<no location info>: error: [GHC-44360]
     System.IO.Unsafe: Can't be safely imported!
     The module itself isn't safe.
 
-
-<no location info>:
+<no location info>: error: [GHC-75165]
     Data.ByteString: Can't be safely imported!
-    The package (bytestring-0.10.1.0) the module resides in isn't trusted.
-
+    The package (bytestring-0.11.3.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/ghci/p4.stderr b/testsuite/tests/safeHaskell/ghci/p4.stderr
index 47ea0ca18e..3e9c555143 100644
--- a/testsuite/tests/safeHaskell/ghci/p4.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p4.stderr
@@ -1,8 +1,9 @@
 
-<interactive>:6:9: error:
+<interactive>:6:9: error: [GHC-76037]
     Not in scope: ‘System.IO.Unsafe.unsafePerformIO’
     NB: no module named ‘System.IO.Unsafe’ is imported.
 
-<interactive>:7:9: error: Variable not in scope: x :: IO b0 -> t
+<interactive>:7:9: error: [GHC-88464]
+    Variable not in scope: x :: IO b0 -> t
 
-<interactive>:8:1: error: Variable not in scope: y
+<interactive>:8:1: error: [GHC-88464] Variable not in scope: y
diff --git a/testsuite/tests/safeHaskell/ghci/p6.stderr b/testsuite/tests/safeHaskell/ghci/p6.stderr
index cba63662ce..922d238e23 100644
--- a/testsuite/tests/safeHaskell/ghci/p6.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p6.stderr
@@ -1,10 +1,10 @@
 
-<interactive>:12:1: error:
+<interactive>:12:1: error: [GHC-57638]
     • Unacceptable result type in foreign declaration:
         Safe Haskell is on, all FFI imports must be in the IO monad
     • When checking declaration:
         foreign import ccall safe "sin" c_sin :: Double -> Double
 
-<interactive>:13:1: error:
+<interactive>:13:1: error: [GHC-88464]
     Variable not in scope: c_sin :: t0 -> t
     Suggested fix: Perhaps use ‘c_sin'’ (line 8)
diff --git a/testsuite/tests/safeHaskell/ghci/p9.stderr b/testsuite/tests/safeHaskell/ghci/p9.stderr
index d3c7fe2f5e..89201ec34a 100644
--- a/testsuite/tests/safeHaskell/ghci/p9.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p9.stderr
@@ -1,2 +1,2 @@
 
-<interactive>:10:1: error: Variable not in scope: b
+<interactive>:10:1: error: [GHC-88464] Variable not in scope: b
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr
index 54dab18cd3..dbf928071a 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr
@@ -2,7 +2,7 @@
 [2 of 3] Compiling SH_Overlap1_A    ( SH_Overlap1_A.hs, SH_Overlap1_A.o )
 [3 of 3] Compiling SH_Overlap1      ( SH_Overlap1.hs, SH_Overlap1.o )
 
-SH_Overlap1.hs:16:8: error:
+SH_Overlap1.hs:16:8: error: [GHC-36705]
     • Unsafe overlapping instances for C [Int]
         arising from a use of ‘f’
       The matching instance is:
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr
index 0e990b4f97..7d9acc9552 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr
@@ -5,7 +5,7 @@
 SH_Overlap11.hs:2:17: warning: [-Wunsafe]
     ‘SH_Overlap11’ has been inferred as unsafe!
     Reason:
-        SH_Overlap11.hs:18:8: warning:
+        SH_Overlap11.hs:18:8: warning: [GHC-36705]
             • Unsafe overlapping instances for C [Int]
                 arising from a use of ‘f’
               The matching instance is:
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr
index 2eed7608d1..39b51b9aad 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr
@@ -2,7 +2,7 @@
 [2 of 3] Compiling SH_Overlap2_A    ( SH_Overlap2_A.hs, SH_Overlap2_A.o )
 [3 of 3] Compiling SH_Overlap2      ( SH_Overlap2.hs, SH_Overlap2.o )
 
-SH_Overlap2.hs:19:8: error:
+SH_Overlap2.hs:19:8: error: [GHC-36705]
     • Unsafe overlapping instances for C [Int]
         arising from a use of ‘f’
       The matching instance is:
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr
index 9de7ecc708..815a6bfd6c 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr
@@ -2,7 +2,7 @@
 [2 of 3] Compiling SH_Overlap5_A    ( SH_Overlap5_A.hs, SH_Overlap5_A.o )
 [3 of 3] Compiling SH_Overlap5      ( SH_Overlap5.hs, SH_Overlap5.o )
 
-SH_Overlap5.hs:16:8: error:
+SH_Overlap5.hs:16:8: error: [GHC-36705]
     • Unsafe overlapping instances for C [Int]
         arising from a use of ‘f’
       The matching instance is:
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr
index 7804b9e5d5..f8aabb0c43 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr
@@ -2,7 +2,7 @@
 [2 of 3] Compiling SH_Overlap6_A    ( SH_Overlap6_A.hs, SH_Overlap6_A.o )
 [3 of 3] Compiling SH_Overlap6      ( SH_Overlap6.hs, SH_Overlap6.o )
 
-SH_Overlap6.hs:15:8: error:
+SH_Overlap6.hs:15:8: error: [GHC-36705]
     • Unsafe overlapping instances for C [Int]
         arising from a use of ‘f’
       The matching instance is:
diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr
index dda1490ce0..3a719cb0b4 100644
--- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr
+++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr
@@ -2,10 +2,10 @@
 [2 of 3] Compiling SH_Overlap7_A    ( SH_Overlap7_A.hs, SH_Overlap7_A.o )
 [3 of 3] Compiling SH_Overlap7      ( SH_Overlap7.hs, SH_Overlap7.o )
 
-SH_Overlap7.hs:2:17: error: [-Wunsafe, -Werror=unsafe]
+SH_Overlap7.hs:2:17: error: [-Wunsafe, Werror=unsafe]
     ‘SH_Overlap7’ has been inferred as unsafe!
     Reason:
-        SH_Overlap7.hs:15:8:
+        SH_Overlap7.hs:15:8: error: [GHC-36705] [-Werror]
             • Unsafe overlapping instances for C [Int]
                 arising from a use of ‘f’
               The matching instance is:
diff --git a/testsuite/tests/safeHaskell/safeInfered/Mixed02.stderr b/testsuite/tests/safeHaskell/safeInfered/Mixed02.stderr
index 9fa48d4338..2a2cd36735 100644
--- a/testsuite/tests/safeHaskell/safeInfered/Mixed02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/Mixed02.stderr
@@ -1,3 +1,3 @@
 
-Mixed02.hs:6:1: error:
+Mixed02.hs:6:1: error: [GHC-70172]
     Module DW is imported both as a safe and unsafe import!
diff --git a/testsuite/tests/safeHaskell/safeInfered/Mixed03.stderr b/testsuite/tests/safeHaskell/safeInfered/Mixed03.stderr
index 0a9523ca33..103283e216 100644
--- a/testsuite/tests/safeHaskell/safeInfered/Mixed03.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/Mixed03.stderr
@@ -1,3 +1,3 @@
 
-Mixed03.hs:6:1: error:
+Mixed03.hs:6:1: error: [GHC-70172]
     Module DW is imported both as a safe and unsafe import!
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
index a74f55b6cf..e9e186fdeb 100644
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
@@ -2,5 +2,5 @@
 SafeInfered05.hs:3:14: warning: [-Wdeprecated-flags (in -Wdefault)]
     -XOverlappingInstances is deprecated: instead use per-instance pragmas OVERLAPPING/OVERLAPPABLE/OVERLAPS
 
-SafeInfered05_A.hs:3:17: warning: [-Wsafe]
+SafeInfered05_A.hs:3:17: warning: [GHC-58656] [-Wsafe]
     ‘SafeInfered05_A’ has been inferred as safe!
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeWarn01.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeWarn01.stderr
index 13155f3043..2e72955521 100644
--- a/testsuite/tests/safeHaskell/safeInfered/SafeWarn01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/SafeWarn01.stderr
@@ -1,3 +1,3 @@
 
-SafeWarn01.hs:3:17: warning: [-Wsafe]
+SafeWarn01.hs:3:17: warning: [GHC-58656] [-Wsafe]
     ‘SafeWarn01’ has been inferred as safe!
diff --git a/testsuite/tests/safeHaskell/safeInfered/TrustworthySafe02.stderr b/testsuite/tests/safeHaskell/safeInfered/TrustworthySafe02.stderr
index 7723e98dc1..e3c1225c95 100644
--- a/testsuite/tests/safeHaskell/safeInfered/TrustworthySafe02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/TrustworthySafe02.stderr
@@ -1,3 +1,3 @@
 
-TrustworthySafe02.hs:2:14: warning: [-Wtrustworthy-safe (in -Wall)]
+TrustworthySafe02.hs:2:14: warning: [GHC-19244] [-Wtrustworthy-safe (in -Wall)]
     ‘TrustworthySafe02’ is marked as Trustworthy but has been inferred as safe!
diff --git a/testsuite/tests/safeHaskell/safeInfered/TrustworthySafe03.stderr b/testsuite/tests/safeHaskell/safeInfered/TrustworthySafe03.stderr
index ff4a4e3631..63d300b589 100644
--- a/testsuite/tests/safeHaskell/safeInfered/TrustworthySafe03.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/TrustworthySafe03.stderr
@@ -1,3 +1,3 @@
 
-TrustworthySafe03.hs:2:14: warning: [-Wtrustworthy-safe (in -Wall)]
+TrustworthySafe03.hs:2:14: warning: [GHC-19244] [-Wtrustworthy-safe (in -Wall)]
     ‘TrustworthySafe03’ is marked as Trustworthy but has been inferred as safe!
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
index ab2707bc59..25aa92371a 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
@@ -1,3 +1,4 @@
-UnsafeInfered01.hs:5:1: error:
+
+UnsafeInfered01.hs:5:1: error: [GHC-44360]
     UnsafeInfered01_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
index f03a7bb314..6f87db4e27 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
@@ -1,3 +1,4 @@
-UnsafeInfered02.hs:5:1: error:
+
+UnsafeInfered02.hs:5:1: error: [GHC-44360]
     UnsafeInfered02_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
index 14af9f7841..15d29efb82 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
@@ -1,3 +1,4 @@
-UnsafeInfered03.hs:5:1: error:
+
+UnsafeInfered03.hs:5:1: error: [GHC-44360]
     UnsafeInfered03_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
index 52684af861..451a7eca5e 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
@@ -1,3 +1,4 @@
-UnsafeInfered05.hs:5:1: error:
+
+UnsafeInfered05.hs:5:1: error: [GHC-44360]
     UnsafeInfered05_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
index e683e04bd6..9eb97bc58f 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
@@ -1,3 +1,4 @@
-UnsafeInfered06.hs:5:1: error:
+
+UnsafeInfered06.hs:5:1: error: [GHC-44360]
     UnsafeInfered06_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
index 9c34e74321..b91a91ff21 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
@@ -1,3 +1,4 @@
-UnsafeInfered09.hs:5:1: error:
+
+UnsafeInfered09.hs:5:1: error: [GHC-44360]
     UnsafeInfered09_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
index 7f1c3fa9c7..086edce3c7 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
@@ -1,3 +1,4 @@
-UnsafeInfered10.hs:6:1: error:
+
+UnsafeInfered10.hs:6:1: error: [GHC-44360]
     UnsafeInfered10_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
index 0122d91398..9b7e910d91 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
@@ -2,10 +2,10 @@
 UnsafeInfered11_A.hs:2:17: warning: [-Wunsafe]
     ‘UnsafeInfered11_A’ has been inferred as unsafe!
     Reason:
-        UnsafeInfered11_A.hs:18:11: warning:
+        UnsafeInfered11_A.hs:18:11: warning: [GHC-56147]
             Rule "lookupx/T" ignored
             Defining user rules is disabled under Safe Haskell
 
-UnsafeInfered11.hs:6:1: error:
+UnsafeInfered11.hs:6:1: error: [GHC-44360]
     UnsafeInfered11_A: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered12.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered12.stderr
index 22a07d9f96..ef8f87e2f3 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered12.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered12.stderr
@@ -1,6 +1,6 @@
 
-UnsafeInfered12.hs:3:17: error: [-Wunsafe, -Werror=unsafe]
+UnsafeInfered12.hs:3:17: error: [-Wunsafe, Werror=unsafe]
     ‘UnsafeInfered12’ has been inferred as unsafe!
     Reason:
-        UnsafeInfered12.hs:2:14:
+        UnsafeInfered12.hs:2:14::
             -XTemplateHaskell is not allowed in Safe Haskell
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn01.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn01.stderr
index 1bced3b94a..4a2c9eeb12 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn01.stderr
@@ -2,6 +2,6 @@
 UnsafeWarn01.hs:3:17: warning: [-Wunsafe]
     ‘UnsafeWarn01’ has been inferred as unsafe!
     Reason:
-        UnsafeWarn01.hs:8:1: error:
+        UnsafeWarn01.hs:8:1: error: [GHC-44360]
             System.IO.Unsafe: Can't be safely imported!
             The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn02.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn02.stderr
index 0061ed3e1d..2b146f8532 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn02.stderr
@@ -2,5 +2,5 @@
 UnsafeWarn02.hs:3:17: warning: [-Wunsafe]
     ‘UnsafeWarn02’ has been inferred as unsafe!
     Reason:
-        UnsafeWarn02.hs:5:14:
+        UnsafeWarn02.hs:5:14::
             -XTemplateHaskell is not allowed in Safe Haskell
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn03.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn03.stderr
index c48a136f74..737160464f 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn03.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn03.stderr
@@ -2,6 +2,6 @@
 UnsafeWarn03.hs:4:17: warning: [-Wunsafe]
     ‘UnsafeWarn03’ has been inferred as unsafe!
     Reason:
-        UnsafeWarn03.hs:9:1: error:
+        UnsafeWarn03.hs:9:1: error: [GHC-44360]
             System.IO.Unsafe: Can't be safely imported!
             The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn04.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn04.stderr
index 94f0203f46..0cfa697192 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn04.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn04.stderr
@@ -2,6 +2,6 @@
 UnsafeWarn04.hs:4:17: warning: [-Wunsafe]
     ‘UnsafeWarn04’ has been inferred as unsafe!
     Reason:
-        UnsafeWarn04.hs:9:1: error:
+        UnsafeWarn04.hs:9:1: error: [GHC-44360]
             System.IO.Unsafe: Can't be safely imported!
             The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn05.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn05.stderr
index c43acb86d8..3d07f34867 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn05.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn05.stderr
@@ -2,13 +2,13 @@
 UnsafeWarn05.hs:5:17: warning: [-Wunsafe]
     ‘UnsafeWarn05’ has been inferred as unsafe!
     Reason:
-        UnsafeWarn05.hs:11:1: error:
+        UnsafeWarn05.hs:11:1: error: [GHC-44360]
             System.IO.Unsafe: Can't be safely imported!
             The module itself isn't safe.
 
 UnsafeWarn05.hs:5:17: warning: [-Wunsafe]
     ‘UnsafeWarn05’ has been inferred as unsafe!
     Reason:
-        UnsafeWarn05.hs:16:11: warning:
+        UnsafeWarn05.hs:16:11: warning: [GHC-56147]
             Rule "g" ignored
             Defining user rules is disabled under Safe Haskell
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn06.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn06.stderr
index 8f7641d2b0..d1a64dc4fe 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn06.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn06.stderr
@@ -2,6 +2,6 @@
 UnsafeWarn06.hs:4:17: warning: [-Wunsafe]
     ‘UnsafeWarn06’ has been inferred as unsafe!
     Reason:
-        UnsafeWarn06.hs:9:11: warning:
+        UnsafeWarn06.hs:9:11: warning: [GHC-56147]
             Rule "f" ignored
             Defining user rules is disabled under Safe Haskell
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn07.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn07.stderr
index 1439e24cc0..88f5e4ea5d 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn07.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeWarn07.stderr
@@ -2,6 +2,6 @@
 UnsafeWarn07.hs:5:17: warning: [-Wunsafe]
     ‘UnsafeWarn07’ has been inferred as unsafe!
     Reason:
-        UnsafeWarn07.hs:10:11: warning:
+        UnsafeWarn07.hs:10:11: warning: [GHC-56147]
             Rule "f" ignored
             Defining user rules is disabled under Safe Haskell
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang03.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang03.stderr
index 02f0cc5ebb..353c1bb45e 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang03.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang03.stderr
@@ -1,4 +1,4 @@
 
-SafeLang03.hs:8:11: warning:
+SafeLang03.hs:8:11: warning: [GHC-56147]
     Rule "f" ignored
     Defining user rules is disabled under Safe Haskell
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang08.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang08.stderr
index 7e1655e00a..c7f6c0ca36 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang08.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang08.stderr
@@ -1,5 +1,5 @@
 
-SafeLang08.hs:10:1: error:
+SafeLang08.hs:10:1: error: [GHC-57638]
     • Unacceptable result type in foreign declaration:
         Safe Haskell is on, all FFI imports must be in the IO monad
     • When checking declaration:
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
index d058bb2599..bb604e5243 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
@@ -2,7 +2,7 @@
 [2 of 4] Compiling SafeLang10_B     ( SafeLang10_B.hs, SafeLang10_B.o )
 [3 of 4] Compiling Main             ( SafeLang10.hs, SafeLang10.o )
 
-SafeLang10.hs:9:13: error:
+SafeLang10.hs:9:13: error: [GHC-36705]
     • Unsafe overlapping instances for Pos [Int]
         arising from a use of ‘res’
       The matching instance is:
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
index 111d0fd19c..ab59ebff30 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
@@ -2,7 +2,7 @@
 [2 of 4] Compiling SafeLang17_B     ( SafeLang17_B.hs, SafeLang17_B.o )
 [3 of 4] Compiling Main             ( SafeLang17.hs, SafeLang17.o )
 
-SafeLang17.hs:9:13: error:
+SafeLang17.hs:9:13: error: [GHC-36705]
     • Unsafe overlapping instances for Pos [Int]
         arising from a use of ‘res’
       The matching instance is:
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr
index 8afd025680..54942148b0 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr
@@ -1,4 +1,4 @@
 
-BadImport01.hs:6:1: error:
+BadImport01.hs:6:1: error: [GHC-44360]
     System.IO.Unsafe: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport06.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport06.stderr
index 06995b8f2c..09b03825bb 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport06.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport06.stderr
@@ -1,4 +1,4 @@
 
-BadImport06.hs:6:1: error:
+BadImport06.hs:6:1: error: [GHC-44360]
     Debug.Trace: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport07.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport07.stderr
index 4782befae7..730b156e84 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport07.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport07.stderr
@@ -1,4 +1,4 @@
 
-BadImport07.hs:6:1: error:
+BadImport07.hs:6:1: error: [GHC-44360]
     Unsafe.Coerce: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport08.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport08.stderr
index 5c45d2ab6a..457c6b2afa 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport08.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport08.stderr
@@ -1,4 +1,4 @@
 
-BadImport08.hs:6:1: error:
+BadImport08.hs:6:1: error: [GHC-44360]
     Control.Monad.ST.Unsafe: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport09.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport09.stderr
index 91611c0fcc..4489d20272 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport09.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport09.stderr
@@ -1,4 +1,4 @@
 
-BadImport09.hs:6:1: error:
+BadImport09.hs:6:1: error: [GHC-44360]
     Control.Monad.ST.Lazy.Unsafe: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr
index fb3cb5eecd..19a830e324 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr
@@ -1,3 +1,3 @@
 
-Dep05.hs:7:1: error:
+Dep05.hs:7:1: error: [GHC-44360]
     GHC.Arr: Can't be safely imported! The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr
index 7824935d91..d50bf28865 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr
@@ -1,3 +1,3 @@
 
-Dep06.hs:5:1: error:
+Dep06.hs:5:1: error: [GHC-44360]
     GHC.Conc: Can't be safely imported! The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr
index cf79a18f6e..9c98dfd4aa 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr
@@ -1,4 +1,4 @@
 
-Dep07.hs:5:1: error:
+Dep07.hs:5:1: error: [GHC-44360]
     GHC.ForeignPtr: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr
index 09fa7d86ee..840e353bd9 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr
@@ -1,4 +1,4 @@
 
-Dep08.hs:6:1: error:
+Dep08.hs:6:1: error: [GHC-44360]
     GHC.IOArray: Can't be safely imported!
     The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr
index 4c776d3832..6682e2da40 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr
@@ -1,3 +1,3 @@
 
-Dep09.hs:5:1: error:
+Dep09.hs:5:1: error: [GHC-44360]
     GHC.Ptr: Can't be safely imported! The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr
index af1627c985..911efa62a4 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr
@@ -1,3 +1,3 @@
 
-Dep10.hs:5:1: error:
+Dep10.hs:5:1: error: [GHC-44360]
     GHC.ST: Can't be safely imported! The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/T21433.stderr b/testsuite/tests/safeHaskell/unsafeLibs/T21433.stderr
index 1604b39c9b..0a7017ea44 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/T21433.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/T21433.stderr
@@ -1,4 +1,4 @@
 
-T21433.hs:6:1: error:
+T21433.hs:6:1: error: [GHC-44360]
     GHC.Prim.PtrEq: Can't be safely imported!
     The module itself isn't safe.