Convert interface file loading errors into proper diagnostics

This patch converts all the errors to do with loading interface files
into proper structured diagnostics.

* DriverMessage: Sometimes in the driver we attempt to load an interface
  file so we embed the IfaceMessage into the DriverMessage.
* TcRnMessage: Most the time we are loading interface files during
  typechecking, so we embed the IfaceMessage

This patch also removes the TcRnInterfaceLookupError constructor which
is superceded by the IfaceMessage, which is now structured compared to
just storing an SDoc before.

33 files changed, 114 insertions, 110 deletions

diff --git a/testsuite/tests/cabal/cabal05/cabal05.stderr b/testsuite/tests/cabal/cabal05/cabal05.stderr
index 183c5319d1..2ff23d3a47 100644
--- a/testsuite/tests/cabal/cabal05/cabal05.stderr
+++ b/testsuite/tests/cabal/cabal05/cabal05.stderr
@@ -1,5 +1,5 @@
 
-T.hs:3:1: error:
-    Ambiguous module name ‘Conflict’:
-      it is bound as p-0.1.0.0:P2 by a reexport in package q-0.1.0.0
-      it is bound as P by a reexport in package r-0.1.0.0
+T.hs:3:1: error: [GHC-45102]
+    Ambiguous module name ‘Conflict’.
+    it is bound as p-0.1.0.0:P2 by a reexport in package q-0.1.0.0
+    it is bound as P by a reexport in package r-0.1.0.0
diff --git a/testsuite/tests/cabal/ghcpkg04.stderr b/testsuite/tests/cabal/ghcpkg04.stderr
index 5cc97f573f..dab99da52d 100644
--- a/testsuite/tests/cabal/ghcpkg04.stderr
+++ b/testsuite/tests/cabal/ghcpkg04.stderr
@@ -1,4 +1,4 @@
 
-ghcpkg04.hs:1:1: error:
-    Ambiguous module name ‘A’:
-      it was found in multiple packages: newtestpkg-2.0 testpkg-1.2.3.4
+ghcpkg04.hs:1:1: error: [GHC-45102]
+    Ambiguous module name ‘A’.
+    it was found in multiple packages: newtestpkg-2.0 testpkg-1.2.3.4
diff --git a/testsuite/tests/count-deps/CountDepsAst.stdout b/testsuite/tests/count-deps/CountDepsAst.stdout
index 652a35a9b7..beb1e54f23 100644
--- a/testsuite/tests/count-deps/CountDepsAst.stdout
+++ b/testsuite/tests/count-deps/CountDepsAst.stdout
@@ -141,6 +141,8 @@ GHC.HsToCore.Errors.Types
 GHC.HsToCore.Pmc.Ppr
 GHC.HsToCore.Pmc.Solver.Types
 GHC.HsToCore.Pmc.Types
+GHC.Iface.Errors.Ppr
+GHC.Iface.Errors.Types
 GHC.Iface.Ext.Fields
 GHC.Iface.Recomp.Binary
 GHC.Iface.Syntax
diff --git a/testsuite/tests/count-deps/CountDepsParser.stdout b/testsuite/tests/count-deps/CountDepsParser.stdout
index 4850f57f96..44fc982440 100644
--- a/testsuite/tests/count-deps/CountDepsParser.stdout
+++ b/testsuite/tests/count-deps/CountDepsParser.stdout
@@ -142,6 +142,8 @@ GHC.HsToCore.Errors.Types
 GHC.HsToCore.Pmc.Ppr
 GHC.HsToCore.Pmc.Solver.Types
 GHC.HsToCore.Pmc.Types
+GHC.Iface.Errors.Ppr
+GHC.Iface.Errors.Types
 GHC.Iface.Ext.Fields
 GHC.Iface.Recomp.Binary
 GHC.Iface.Syntax
diff --git a/testsuite/tests/driver/driver063.stderr b/testsuite/tests/driver/driver063.stderr
index 307467b27b..979b5ee506 100644
--- a/testsuite/tests/driver/driver063.stderr
+++ b/testsuite/tests/driver/driver063.stderr
@@ -1,4 +1,4 @@
 
-D063.hs:2:1: error:
-    Could not find module ‘A063’
+D063.hs:2:1: error: [GHC-35235]
+    Could not find module ‘A063’.
     It is not a module in the current program, or in any known package.
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001.stderr b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001.stderr
index 349b5f2816..2b10199ac0 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001.stderr
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001.stderr
@@ -1,5 +1,5 @@
 
-C.hs:5:1: error:
+C.hs:5:1: error: [GHC-54709]
     Dynamic hash doesn't match for ‘B’
     Normal interface file from ./B.hi
     Dynamic interface file from ./B.dyn_hi
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001boot/dynamicToo001boot.stderr b/testsuite/tests/driver/dynamicToo/dynamicToo001boot/dynamicToo001boot.stderr
index 8b17cac27a..95cf763877 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo001boot/dynamicToo001boot.stderr
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo001boot/dynamicToo001boot.stderr
@@ -1,5 +1,5 @@
 
-C.hs:5:1: error:
+C.hs:5:1: error: [GHC-54709]
     Dynamic hash doesn't match for ‘B’
     Normal interface file from ./B.hi-boot
     Dynamic interface file from ./B.dyn_hi-boot
diff --git a/testsuite/tests/driver/multipleHomeUnits/multipleHomeUnitsModuleVisibility.stderr b/testsuite/tests/driver/multipleHomeUnits/multipleHomeUnitsModuleVisibility.stderr
index b1cd097d13..f6c9781fcc 100644
--- a/testsuite/tests/driver/multipleHomeUnits/multipleHomeUnitsModuleVisibility.stderr
+++ b/testsuite/tests/driver/multipleHomeUnits/multipleHomeUnitsModuleVisibility.stderr
@@ -1,5 +1,5 @@
 
-module-visibility-import/MV.hs:5:1: error:
-    Could not load module ‘MV2’
+module-visibility-import/MV.hs:5:1: error: [GHC-87110]
+    Could not load module ‘MV2’.
     it is a hidden module in the package ‘mv’
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs
index 82981a9e82..c6d35773f7 100644
--- a/testsuite/tests/ghc-api/T4891/T4891.hs
+++ b/testsuite/tests/ghc-api/T4891/T4891.hs
@@ -62,6 +62,6 @@ chaseConstructor !hv = do
           Right dcName -> do
             putStrLn $ "Name: "      ++ showPpr dflags dcName
             putStrLn $ "OccString: " ++ "'" ++ getOccString dcName ++ "'"
-            dc <- ioLookupDataCon hscEnv dcName
+            dc <- lookupGlobal hscEnv dcName
             putStrLn $ "DataCon: "   ++ showPpr dflags dc
     _ -> return ()
diff --git a/testsuite/tests/ghc-api/T4891/T4891.stdout b/testsuite/tests/ghc-api/T4891/T4891.stdout
index 8ad0b4eabe..758d497e16 100644
--- a/testsuite/tests/ghc-api/T4891/T4891.stdout
+++ b/testsuite/tests/ghc-api/T4891/T4891.stdout
@@ -1,20 +1,20 @@
 =====
 Name: False
 OccString: 'False'
-DataCon: False
+DataCon: Data constructor ‘False’
 =====
 Name: :
 OccString: ':'
-DataCon: :
+DataCon: Data constructor ‘:’
 =====
 Name: :->
 OccString: ':->'
-DataCon: :->
+DataCon: Data constructor ‘:->’
 =====
 Name: :->.
 OccString: ':->.'
-DataCon: :->.
+DataCon: Data constructor ‘:->.’
 =====
 Name: :->.+
 OccString: ':->.+'
-DataCon: :->.+
+DataCon: Data constructor ‘:->.+’
diff --git a/testsuite/tests/ghc-api/target-contents/TargetContents.stderr b/testsuite/tests/ghc-api/target-contents/TargetContents.stderr
index 3fa570ca1d..f1dfb73027 100644
--- a/testsuite/tests/ghc-api/target-contents/TargetContents.stderr
+++ b/testsuite/tests/ghc-api/target-contents/TargetContents.stderr
@@ -16,8 +16,8 @@ B.hs:3:5: error: [GHC-88464] Variable not in scope: z
 B.hs:3:5: error: [GHC-88464] Variable not in scope: z
 == Dep_Error_MM_A
 
-A.hs:3:1: error:
-    Could not find module ‘B’
+A.hs:3:1: error: [GHC-87110]
+    Could not find module ‘B’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 == Dep_DM_AB
 == Dep_Error_DM_AB
@@ -25,8 +25,8 @@ A.hs:3:1: error:
 B.hs:3:5: error: [GHC-88464] Variable not in scope: z
 == Dep_Error_DM_A
 
-A.hs:3:1: error:
-    Could not find module ‘B’
+A.hs:3:1: error: [GHC-87110]
+    Could not find module ‘B’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 == Dep_MD_AB
 == Dep_Error_MD_AB
diff --git a/testsuite/tests/ghc-e/should_fail/T9905fail1.stderr b/testsuite/tests/ghc-e/should_fail/T9905fail1.stderr
index 9d0d79c23e..ccbb16662d 100644
--- a/testsuite/tests/ghc-e/should_fail/T9905fail1.stderr
+++ b/testsuite/tests/ghc-e/should_fail/T9905fail1.stderr
@@ -1,5 +1,5 @@
 
-<no location info>: error:
-    Could not find module ‘This.Module.Does.Not.Exist’
+<no location info>: error: [GHC-35235]
+    Could not find module ‘This.Module.Does.Not.Exist’.
     It is not a module in the current program, or in any known package.
 1
diff --git a/testsuite/tests/ghc-e/should_run/T2636.stderr b/testsuite/tests/ghc-e/should_run/T2636.stderr
index 9a2c6674c9..a471f15686 100644
--- a/testsuite/tests/ghc-e/should_run/T2636.stderr
+++ b/testsuite/tests/ghc-e/should_run/T2636.stderr
@@ -1,4 +1,4 @@
 
-T2636.hs:1:1: error:
-    Could not find module ‘MissingModule’
+T2636.hs:1:1: error: [GHC-87110]
+    Could not find module ‘MissingModule’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/ghci.debugger/scripts/dynbrk001.stderr b/testsuite/tests/ghci.debugger/scripts/dynbrk001.stderr
index 49283bea08..e78b9f1eaa 100644
--- a/testsuite/tests/ghci.debugger/scripts/dynbrk001.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk001.stderr
@@ -1,4 +1,4 @@
 
-<no location info>:
-    Could not find module ‘NonModule’
+<no location info>: error: [GHC-35235]
+    Could not find module ‘NonModule’.
     It is not a module in the current program, or in any known package.
diff --git a/testsuite/tests/ghci/scripts/T20455.stderr b/testsuite/tests/ghci/scripts/T20455.stderr
index db1df877e3..c2a4c9599d 100644
--- a/testsuite/tests/ghci/scripts/T20455.stderr
+++ b/testsuite/tests/ghci/scripts/T20455.stderr
@@ -6,6 +6,6 @@
         ‘Ghci1.l’ (imported from Ghci1), ‘l’ (line 2),
         ‘all’ (imported from Prelude)
 
-<no location info>: error:
-    Could not find module ‘Ghci1’
+<no location info>: error: [GHC-35235]
+    Could not find module ‘Ghci1’.
     It is not a module in the current program, or in any known package.
diff --git a/testsuite/tests/ghci/scripts/T5836.stderr b/testsuite/tests/ghci/scripts/T5836.stderr
index 80de015c5c..14369e8fea 100644
--- a/testsuite/tests/ghci/scripts/T5836.stderr
+++ b/testsuite/tests/ghci/scripts/T5836.stderr
@@ -1,4 +1,4 @@
 
-<no location info>:
-    Could not find module ‘Does.Not.Exist’
+<no location info>: error: [GHC-35235]
+    Could not find module ‘Does.Not.Exist’.
     It is not a module in the current program, or in any known package.
diff --git a/testsuite/tests/ghci/scripts/T5979.stderr b/testsuite/tests/ghci/scripts/T5979.stderr
index 75dc448445..8ad77a8204 100644
--- a/testsuite/tests/ghci/scripts/T5979.stderr
+++ b/testsuite/tests/ghci/scripts/T5979.stderr
@@ -1,7 +1,7 @@
 
-<no location info>: error:
-    Could not find module ‘Control.Monad.Trans.State’
+<no location info>: error: [GHC-61948]
+    Could not find module ‘Control.Monad.Trans.State’.
     Perhaps you meant
-      Control.Monad.Trans.State (from transformers-0.5.6.2)
-      Control.Monad.Trans.Cont (from transformers-0.5.6.2)
-      Control.Monad.Trans.Class (from transformers-0.5.6.2)
+      Control.Monad.Trans.State (from transformers-0.6.1.0)
+      Control.Monad.Trans.Cont (from transformers-0.6.1.0)
+      Control.Monad.Trans.Class (from transformers-0.6.1.0)
diff --git a/testsuite/tests/ghci/should_fail/T15055.stderr b/testsuite/tests/ghci/should_fail/T15055.stderr
index fbf540edfd..c5e54166bc 100644
--- a/testsuite/tests/ghci/should_fail/T15055.stderr
+++ b/testsuite/tests/ghci/should_fail/T15055.stderr
@@ -1,6 +1,6 @@
 
-<no location info>: error:
-    Could not load module ‘GHC’
-    It is a member of the hidden package ‘ghc-8.5’.
+<no location info>: error: [GHC-87110]
+    Could not load module ‘GHC’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
diff --git a/testsuite/tests/module/mod1.stderr b/testsuite/tests/module/mod1.stderr
index 9bcff0bc5d..d3d2278f79 100644
--- a/testsuite/tests/module/mod1.stderr
+++ b/testsuite/tests/module/mod1.stderr
@@ -1,4 +1,4 @@
 
-mod1.hs:3:1: error:
-    Could not find module ‘N’
+mod1.hs:3:1: error: [GHC-87110]
+    Could not find module ‘N’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/module/mod2.stderr b/testsuite/tests/module/mod2.stderr
index d9d07168b7..78bb04bda3 100644
--- a/testsuite/tests/module/mod2.stderr
+++ b/testsuite/tests/module/mod2.stderr
@@ -1,4 +1,4 @@
 
-mod2.hs:3:1: error:
-    Could not find module ‘N’
+mod2.hs:3:1: error: [GHC-87110]
+    Could not find module ‘N’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/T4806.stderr b/testsuite/tests/package/T4806.stderr
index 99bde2ec0d..786715548f 100644
--- a/testsuite/tests/package/T4806.stderr
+++ b/testsuite/tests/package/T4806.stderr
@@ -1,6 +1,6 @@
 
-T4806.hs:1:1: error:
-    Could not load module ‘Data.Map’
-    It is a member of the package ‘containers-0.6.0.1’
+T4806.hs:1:1: error: [GHC-87110]
+    Could not load module ‘Data.Map’.
+    It is a member of the package ‘containers-0.6.7’
     which is ignored due to an -ignore-package flag
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/T4806a.stderr b/testsuite/tests/package/T4806a.stderr
index fe98798453..b1cc036bbf 100644
--- a/testsuite/tests/package/T4806a.stderr
+++ b/testsuite/tests/package/T4806a.stderr
@@ -1,7 +1,7 @@
 
-T4806a.hs:1:1: error:
-    Could not load module ‘Data.Map’
-    It is a member of the package ‘containers-0.6.6’
+T4806a.hs:1:1: error: [GHC-87110]
+    Could not load module ‘Data.Map’.
+    It is a member of the package ‘containers-0.6.7’
     which is unusable because the -ignore-package flag was used to ignore at least one of its dependencies:
-      deepseq-1.4.8.0 template-haskell-2.20.0.0
+      deepseq-1.4.8.1 template-haskell-2.20.0.0
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index 3381a1bd42..623f8346a5 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,14 +1,14 @@
 
-package01e.hs:2:1: error:
-    Could not load module ‘Data.Map’
-    It is a member of the hidden package ‘containers-0.6.0.1’.
+package01e.hs:2:1: error: [GHC-87110]
+    Could not load module ‘Data.Map’.
+    It is a member of the hidden package ‘containers-0.6.7’.
     You can run ‘:set -package containers’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-package01e.hs:3:1: error:
-    Could not load module ‘Data.IntMap’
-    It is a member of the hidden package ‘containers-0.6.0.1’.
+package01e.hs:3:1: error: [GHC-87110]
+    Could not load module ‘Data.IntMap’.
+    It is a member of the hidden package ‘containers-0.6.7’.
     You can run ‘:set -package containers’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package06e.stderr b/testsuite/tests/package/package06e.stderr
index 16b03b49d2..73c45713cc 100644
--- a/testsuite/tests/package/package06e.stderr
+++ b/testsuite/tests/package/package06e.stderr
@@ -1,14 +1,14 @@
 
-package06e.hs:2:1: error:
-    Could not load module ‘GHC.Hs.Type’
-    It is a member of the hidden package ‘ghc-8.7’.
+package06e.hs:2:1: error: [GHC-87110]
+    Could not load module ‘GHC.Hs.Type’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-package06e.hs:3:1: error:
-    Could not load module ‘GHC.Types.Unique.FM’
-    It is a member of the hidden package ‘ghc-8.7’.
+package06e.hs:3:1: error: [GHC-87110]
+    Could not load module ‘GHC.Types.Unique.FM’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package07e.stderr b/testsuite/tests/package/package07e.stderr
index 7762072014..f0fe055ff7 100644
--- a/testsuite/tests/package/package07e.stderr
+++ b/testsuite/tests/package/package07e.stderr
@@ -1,29 +1,29 @@
 
-package07e.hs:2:1: error:
-    Could not find module ‘GHC.Hs.MyTypes’
+package07e.hs:2:1: error: [GHC-61948]
+    Could not find module ‘GHC.Hs.MyTypes’.
     Perhaps you meant
-      GHC.Hs.Type (needs flag -package-id ghc-9.3)
-      GHC.Tc.Types (needs flag -package-id ghc-9.3)
-      GHC.Hs.Syn.Type (needs flag -package-id ghc-9.3)
+      GHC.Hs.Type (needs flag -package-id ghc-9.7)
+      GHC.Tc.Types (needs flag -package-id ghc-9.7)
+      GHC.Hs.Syn.Type (needs flag -package-id ghc-9.7)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-package07e.hs:3:1: error:
-    Could not load module ‘GHC.Hs.Type’
-    It is a member of the hidden package ‘ghc-9.3’.
+package07e.hs:3:1: error: [GHC-87110]
+    Could not load module ‘GHC.Hs.Type’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-package07e.hs:4:1: error:
-    Could not load module ‘GHC.Hs.Utils’
-    It is a member of the hidden package ‘ghc-9.3’.
+package07e.hs:4:1: error: [GHC-87110]
+    Could not load module ‘GHC.Hs.Utils’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-package07e.hs:5:1: error:
-    Could not load module ‘GHC.Types.Unique.FM’
-    It is a member of the hidden package ‘ghc-9.3’.
+package07e.hs:5:1: error: [GHC-87110]
+    Could not load module ‘GHC.Types.Unique.FM’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package08e.stderr b/testsuite/tests/package/package08e.stderr
index 5d0867c908..3c9d05df20 100644
--- a/testsuite/tests/package/package08e.stderr
+++ b/testsuite/tests/package/package08e.stderr
@@ -1,29 +1,29 @@
 
-package08e.hs:2:1: error:
-    Could not find module ‘GHC.Hs.MyTypes’
+package08e.hs:2:1: error: [GHC-61948]
+    Could not find module ‘GHC.Hs.MyTypes’.
     Perhaps you meant
-      GHC.Hs.Type (needs flag -package-id ghc-9.3)
-      GHC.Tc.Types (needs flag -package-id ghc-9.3)
-      GHC.Hs.Syn.Type (needs flag -package-id ghc-9.3)
+      GHC.Hs.Type (needs flag -package-id ghc-9.7)
+      GHC.Tc.Types (needs flag -package-id ghc-9.7)
+      GHC.Hs.Syn.Type (needs flag -package-id ghc-9.7)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-package08e.hs:3:1: error:
-    Could not load module ‘GHC.Hs.Type’
-    It is a member of the hidden package ‘ghc-9.3’.
+package08e.hs:3:1: error: [GHC-87110]
+    Could not load module ‘GHC.Hs.Type’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-package08e.hs:4:1: error:
-    Could not load module ‘GHC.Hs.Utils’
-    It is a member of the hidden package ‘ghc-9.3’.
+package08e.hs:4:1: error: [GHC-87110]
+    Could not load module ‘GHC.Hs.Utils’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-package08e.hs:5:1: error:
-    Could not load module ‘GHC.Types.Unique.FM’
-    It is a member of the hidden package ‘ghc-9.3’.
+package08e.hs:5:1: error: [GHC-87110]
+    Could not load module ‘GHC.Types.Unique.FM’.
+    It is a member of the hidden package ‘ghc-9.7’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package09e.stderr b/testsuite/tests/package/package09e.stderr
index 3ce28df519..555835da5c 100644
--- a/testsuite/tests/package/package09e.stderr
+++ b/testsuite/tests/package/package09e.stderr
@@ -1,5 +1,5 @@
 
-package09e.hs:2:1: error:
-    Ambiguous module name ‘M’:
-      it is bound as Data.Set by a package flag
-      it is bound as Data.Map by a package flag
+package09e.hs:2:1: error: [GHC-45102]
+    Ambiguous module name ‘M’.
+    it is bound as Data.Set by a package flag
+    it is bound as Data.Map by a package flag
diff --git a/testsuite/tests/perf/compiler/parsing001.stderr b/testsuite/tests/perf/compiler/parsing001.stderr
index 8293a1acd1..79b2645259 100644
--- a/testsuite/tests/perf/compiler/parsing001.stderr
+++ b/testsuite/tests/perf/compiler/parsing001.stderr
@@ -1,4 +1,4 @@
 
-parsing001.hs:3:1: error:
-    Could not find module ‘Wibble’
+parsing001.hs:3:1: error: [GHC-87110]
+    Could not find module ‘Wibble’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/plugins/T11244.stderr b/testsuite/tests/plugins/T11244.stderr
index 72f01060db..5701d9d342 100644
--- a/testsuite/tests/plugins/T11244.stderr
+++ b/testsuite/tests/plugins/T11244.stderr
@@ -1,4 +1,4 @@
-<command line>: Could not load module ‘RuleDefiningPlugin’
+<command line>: Could not load module ‘RuleDefiningPlugin’.
 It is a member of the hidden package ‘rule-defining-plugin-0.1’.
 You can run ‘:set -package rule-defining-plugin’ to expose it.
 (Note: this unloads all the modules in the current scope.)
diff --git a/testsuite/tests/plugins/plugins03.stderr b/testsuite/tests/plugins/plugins03.stderr
index a923550592..d964311ba6 100644
--- a/testsuite/tests/plugins/plugins03.stderr
+++ b/testsuite/tests/plugins/plugins03.stderr
@@ -1,2 +1,2 @@
-<command line>: Could not find module ‘Simple.NonExistentPlugin’
+<command line>: Could not find module ‘Simple.NonExistentPlugin’.
 Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
index acfb8de460..7d26176149 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
@@ -2,6 +2,6 @@
 SafeLang07.hs:2:14: warning:
     -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving
 
-SafeLang07.hs:15:1: error:
-    Could not find module ‘SafeLang07_A’
+SafeLang07.hs:15:1: error: [GHC-87110]
+    Could not find module ‘SafeLang07_A’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/th/T10279.stderr b/testsuite/tests/th/T10279.stderr
index 4a06b1d775..cd60385c58 100644
--- a/testsuite/tests/th/T10279.stderr
+++ b/testsuite/tests/th/T10279.stderr
@@ -1,6 +1,6 @@
 
-T10279.hs:10:9: error: [GHC-52243]
-    • Failed to load interface for ‘A’
+T10279.hs:10:9: error: [GHC-51294]
+    • Failed to load interface for ‘A’.
       no unit id matching ‘rts-1.0.2’ was found
       (This unit ID looks like the source package ID;
        the real unit ID is ‘rts’)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail082.stderr b/testsuite/tests/typecheck/should_fail/tcfail082.stderr
index 31317b2c42..f72d4e04c4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail082.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail082.stderr
@@ -1,12 +1,12 @@
 
-tcfail082.hs:2:1: error:
-    Could not find module ‘Data82’
+tcfail082.hs:2:1: error: [GHC-87110]
+    Could not find module ‘Data82’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-tcfail082.hs:3:1: error:
-    Could not find module ‘Inst82_1’
+tcfail082.hs:3:1: error: [GHC-87110]
+    Could not find module ‘Inst82_1’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
-tcfail082.hs:4:1: error:
-    Could not find module ‘Inst82_2’
+tcfail082.hs:4:1: error: [GHC-87110]
+    Could not find module ‘Inst82_2’.
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.