Add structured error messages for GHC.Rename.Names

Tracking ticket: #20115

MR: !10336

This converts uses of `mkTcRnUnknownMessage` to newly added constructors
of `TcRnMessage`.

68 files changed, 104 insertions, 74 deletions

diff --git a/testsuite/tests/deriving/should_compile/T17324.stderr b/testsuite/tests/deriving/should_compile/T17324.stderr
index 54e6534462..0ae00ce62d 100644
--- a/testsuite/tests/deriving/should_compile/T17324.stderr
+++ b/testsuite/tests/deriving/should_compile/T17324.stderr
@@ -1,4 +1,4 @@
 
-T17324.hs:8:1: warning: [-Wunused-imports (in -Wextra)]
+T17324.hs:8:1: warning: [GHC-38856] [-Wunused-imports (in -Wextra)]
     The import of ‘Dual, Product, Sum’
     from module ‘Data.Monoid’ is redundant
diff --git a/testsuite/tests/driver/t22391/t22391.stderr b/testsuite/tests/driver/t22391/t22391.stderr
index e24daa51ae..bdb2abe792 100644
--- a/testsuite/tests/driver/t22391/t22391.stderr
+++ b/testsuite/tests/driver/t22391/t22391.stderr
@@ -20,12 +20,12 @@ src/Lib/B.hs:3:12: warning: [GHC-18042] [-Wtype-defaults (in -Wall)]
     • In the expression: 4
       In an equation for ‘warnmeup’: warnmeup = 4
 
-src/Lib.hs:5:1: warning: [-Wunused-imports (in -Wextra)]
+src/Lib.hs:5:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘Lib.A’ is redundant
       except perhaps to import instances from ‘Lib.A’
     To import instances alone, use: import Lib.A()
 
-src/Lib.hs:6:1: warning: [-Wunused-imports (in -Wextra)]
+src/Lib.hs:6:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘Lib.B’ is redundant
       except perhaps to import instances from ‘Lib.B’
     To import instances alone, use: import Lib.B()
diff --git a/testsuite/tests/driver/t22391/t22391j.stderr b/testsuite/tests/driver/t22391/t22391j.stderr
index e24daa51ae..bdb2abe792 100644
--- a/testsuite/tests/driver/t22391/t22391j.stderr
+++ b/testsuite/tests/driver/t22391/t22391j.stderr
@@ -20,12 +20,12 @@ src/Lib/B.hs:3:12: warning: [GHC-18042] [-Wtype-defaults (in -Wall)]
     • In the expression: 4
       In an equation for ‘warnmeup’: warnmeup = 4
 
-src/Lib.hs:5:1: warning: [-Wunused-imports (in -Wextra)]
+src/Lib.hs:5:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘Lib.A’ is redundant
       except perhaps to import instances from ‘Lib.A’
     To import instances alone, use: import Lib.A()
 
-src/Lib.hs:6:1: warning: [-Wunused-imports (in -Wextra)]
+src/Lib.hs:6:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘Lib.B’ is redundant
       except perhaps to import instances from ‘Lib.B’
     To import instances alone, use: import Lib.B()
diff --git a/testsuite/tests/ghci/prog018/prog018.stdout b/testsuite/tests/ghci/prog018/prog018.stdout
index c7b39ad2ed..1fff03d755 100644
--- a/testsuite/tests/ghci/prog018/prog018.stdout
+++ b/testsuite/tests/ghci/prog018/prog018.stdout
@@ -10,7 +10,7 @@ A.hs:5:1: warning: [GHC-62161] [-Wincomplete-patterns (in -Wextra)]
 A.hs:8:15: warning: [-Wunused-matches (in -Wextra)]
     Defined but not used: ‘x’
 
-B.hs:7:1: warning: [-Wunused-imports (in -Wextra)]
+B.hs:7:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘Data.Tuple’ is redundant
       except perhaps to import instances from ‘Data.Tuple’
     To import instances alone, use: import Data.Tuple()
diff --git a/testsuite/tests/ghci/scripts/T4127a.stderr b/testsuite/tests/ghci/scripts/T4127a.stderr
index 829ae2f8ca..d879509df2 100644
--- a/testsuite/tests/ghci/scripts/T4127a.stderr
+++ b/testsuite/tests/ghci/scripts/T4127a.stderr
@@ -1,5 +1,5 @@
 
-<interactive>:2:68:
+<interactive>:2:68: [GHC-29916]
     Multiple declarations of ‘f’
     Declared at: <interactive>:2:32
                  <interactive>:2:68
diff --git a/testsuite/tests/ghci/scripts/ghci048.stderr b/testsuite/tests/ghci/scripts/ghci048.stderr
index 27cc18f708..b4abcf506e 100644
--- a/testsuite/tests/ghci/scripts/ghci048.stderr
+++ b/testsuite/tests/ghci/scripts/ghci048.stderr
@@ -1,10 +1,10 @@
 
-<interactive>:3:16:
+<interactive>:3:16: [GHC-29916]
     Multiple declarations of ‘A’
     Declared at: <interactive>:3:12
                  <interactive>:3:16
 
-<interactive>:5:16:
+<interactive>:5:16: [GHC-29916]
     Multiple declarations of ‘A’
     Declared at: <interactive>:5:12
                  <interactive>:5:16
diff --git a/testsuite/tests/module/T1074.stderr b/testsuite/tests/module/T1074.stderr
index 14e56e8c07..30cc86fbfc 100644
--- a/testsuite/tests/module/T1074.stderr
+++ b/testsuite/tests/module/T1074.stderr
@@ -1,5 +1,5 @@
 
-T1074.hs:6:1: warning: [-Wunused-imports (in -Wextra)]
+T1074.hs:6:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The qualified import of ‘Control.Monad.Reader’ is redundant
       except perhaps to import instances from ‘Control.Monad.Reader’
     To import instances alone, use: import Control.Monad.Reader()
diff --git a/testsuite/tests/module/T11970A.stderr b/testsuite/tests/module/T11970A.stderr
index 6b478a7335..c717ebf00a 100644
--- a/testsuite/tests/module/T11970A.stderr
+++ b/testsuite/tests/module/T11970A.stderr
@@ -1,5 +1,5 @@
 [1 of 2] Compiling T11970A1         ( T11970A1.hs, T11970A1.o )
 [2 of 2] Compiling T11970A          ( T11970A.hs, T11970A.o )
 
-T11970A.hs:3:1: warning: [-Wunused-imports (in -Wextra)]
+T11970A.hs:3:1: warning: [GHC-38856] [-Wunused-imports (in -Wextra)]
     The import of ‘Fail(b)’ from module ‘T11970A1’ is redundant
diff --git a/testsuite/tests/module/mod176.stderr b/testsuite/tests/module/mod176.stderr
index 20ccfc1ffb..a8b51c1a4b 100644
--- a/testsuite/tests/module/mod176.stderr
+++ b/testsuite/tests/module/mod176.stderr
@@ -1,4 +1,4 @@
 
-mod176.hs:4:1: warning: [-Wunused-imports (in -Wextra)]
+mod176.hs:4:1: warning: [GHC-38856] [-Wunused-imports (in -Wextra)]
     The import of ‘Monad, return’
     from module ‘Control.Monad’ is redundant
diff --git a/testsuite/tests/module/mod177.stderr b/testsuite/tests/module/mod177.stderr
index ea9306aa76..02edcbffdd 100644
--- a/testsuite/tests/module/mod177.stderr
+++ b/testsuite/tests/module/mod177.stderr
@@ -1,5 +1,5 @@
 
-mod177.hs:4:1: warning: [-Wunused-imports (in -Wextra)]
+mod177.hs:4:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘Data.Maybe’ is redundant
       except perhaps to import instances from ‘Data.Maybe’
     To import instances alone, use: import Data.Maybe()
diff --git a/testsuite/tests/module/mod18.stderr b/testsuite/tests/module/mod18.stderr
index 0e1a4e3b7f..1f4198a167 100644
--- a/testsuite/tests/module/mod18.stderr
+++ b/testsuite/tests/module/mod18.stderr
@@ -1,5 +1,5 @@
 
-mod18.hs:3:1:
+mod18.hs:3:1: [GHC-29916]
     Multiple declarations of ‘T’
     Declared at: mod18.hs:2:1
                  mod18.hs:3:1
diff --git a/testsuite/tests/module/mod19.stderr b/testsuite/tests/module/mod19.stderr
index b59d584f21..821b6d3fa1 100644
--- a/testsuite/tests/module/mod19.stderr
+++ b/testsuite/tests/module/mod19.stderr
@@ -1,10 +1,10 @@
 
-mod19.hs:3:1:
+mod19.hs:3:1: [GHC-29916]
     Multiple declarations of ‘C’
     Declared at: mod19.hs:2:1
                  mod19.hs:3:1
 
-mod19.hs:3:17:
+mod19.hs:3:17: [GHC-29916]
     Multiple declarations of ‘m’
     Declared at: mod19.hs:2:17
                  mod19.hs:3:17
diff --git a/testsuite/tests/module/mod20.stderr b/testsuite/tests/module/mod20.stderr
index 23190d6a2f..3352ef308a 100644
--- a/testsuite/tests/module/mod20.stderr
+++ b/testsuite/tests/module/mod20.stderr
@@ -1,5 +1,5 @@
 
-mod20.hs:3:18:
+mod20.hs:3:18: [GHC-29916]
     Multiple declarations of ‘m’
     Declared at: mod20.hs:2:18
                  mod20.hs:3:18
diff --git a/testsuite/tests/module/mod21.stderr b/testsuite/tests/module/mod21.stderr
index 09c83c05ce..3e2ae15831 100644
--- a/testsuite/tests/module/mod21.stderr
+++ b/testsuite/tests/module/mod21.stderr
@@ -1,5 +1,5 @@
 
-mod21.hs:3:1:
+mod21.hs:3:1: [GHC-29916]
     Multiple declarations of ‘T’
     Declared at: mod21.hs:2:1
                  mod21.hs:3:1
diff --git a/testsuite/tests/module/mod22.stderr b/testsuite/tests/module/mod22.stderr
index d1d61ba628..ee292d7ee3 100644
--- a/testsuite/tests/module/mod22.stderr
+++ b/testsuite/tests/module/mod22.stderr
@@ -1,5 +1,5 @@
 
-mod22.hs:3:11:
+mod22.hs:3:11: [GHC-29916]
     Multiple declarations of ‘K’
     Declared at: mod22.hs:2:11
                  mod22.hs:3:11
diff --git a/testsuite/tests/module/mod38.stderr b/testsuite/tests/module/mod38.stderr
index 971d31c931..1ac5f7c830 100644
--- a/testsuite/tests/module/mod38.stderr
+++ b/testsuite/tests/module/mod38.stderr
@@ -1,5 +1,5 @@
 
-mod38.hs:4:1:
+mod38.hs:4:1: [GHC-29916]
     Multiple declarations of ‘C’
     Declared at: mod38.hs:3:1
                  mod38.hs:4:1
diff --git a/testsuite/tests/module/mod66.stderr b/testsuite/tests/module/mod66.stderr
index 4a03192ef0..cb0db5d55c 100644
--- a/testsuite/tests/module/mod66.stderr
+++ b/testsuite/tests/module/mod66.stderr
@@ -1,5 +1,5 @@
 
-mod66.hs:5:1:
+mod66.hs:5:1: [GHC-29916]
     Multiple declarations of ‘f’
     Declared at: mod66.hs:3:1
                  mod66.hs:5:1
diff --git a/testsuite/tests/overloadedrecflds/should_fail/FieldSelectors.stderr b/testsuite/tests/overloadedrecflds/should_fail/FieldSelectors.stderr
index 8edc117f3d..14542c580b 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/FieldSelectors.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/FieldSelectors.stderr
@@ -1,4 +1,4 @@
-FieldSelectors.hs:10:1:
+FieldSelectors.hs:10:1: [GHC-29916]
     Multiple declarations of ‘foo’
     Declared at: FieldSelectors.hs:8:18
-                 FieldSelectors.hs:10:1
\ No newline at end of file
+                 FieldSelectors.hs:10:1
diff --git a/testsuite/tests/overloadedrecflds/should_fail/NFSDuplicate.stderr b/testsuite/tests/overloadedrecflds/should_fail/NFSDuplicate.stderr
index f30bb1e490..e76dc0703c 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/NFSDuplicate.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/NFSDuplicate.stderr
@@ -1,5 +1,5 @@
 
-NFSDuplicate.hs:8:16: error:
+NFSDuplicate.hs:8:16: error: [GHC-29916]
     Multiple declarations of ‘foo’
     Declared at: NFSDuplicate.hs:7:16
                  NFSDuplicate.hs:8:16
diff --git a/testsuite/tests/overloadedrecflds/should_fail/T17965.stderr b/testsuite/tests/overloadedrecflds/should_fail/T17965.stderr
index 446913eda4..16d2ecdb37 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/T17965.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/T17965.stderr
@@ -1,5 +1,5 @@
 
-T17965.hs:4:17: error:
+T17965.hs:4:17: error: [GHC-29916]
     Multiple declarations of ‘f’
     Declared at: T17965.hs:3:29
                  T17965.hs:4:17
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail03.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail03.stderr
index 4aec21c608..9629d7e027 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail03.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail03.stderr
@@ -1,5 +1,5 @@
 
-overloadedrecfldsfail03.hs:8:16:
+overloadedrecfldsfail03.hs:8:16: [GHC-29916]
     Multiple declarations of ‘foo’
     Declared at: overloadedrecfldsfail03.hs:6:1
                  overloadedrecfldsfail03.hs:8:16
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr
index 3f0b17106a..f1b59db83f 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr
@@ -10,20 +10,20 @@ OverloadedRecFldsFail06_A.hs:9:59: warning: [-Wunused-top-binds (in -Wextra, -Wu
     Defined but not used: record field of MkUnused ‘used_locally’
 [2 of 3] Compiling Main             ( overloadedrecfldsfail06.hs, overloadedrecfldsfail06.o )
 
-overloadedrecfldsfail06.hs:7:1: error: [-Wunused-imports (in -Wextra), Werror=unused-imports]
+overloadedrecfldsfail06.hs:7:1: error: [GHC-38856] [-Wunused-imports (in -Wextra), Werror=unused-imports]
     The import of ‘MkV, Unused, Unused(unused), V(x), U(y)’
     from module ‘OverloadedRecFldsFail06_A’ is redundant
 
-overloadedrecfldsfail06.hs:8:1: error: [-Wunused-imports (in -Wextra), Werror=unused-imports]
+overloadedrecfldsfail06.hs:8:1: error: [GHC-66111] [-Wunused-imports (in -Wextra), Werror=unused-imports]
     The qualified import of ‘OverloadedRecFldsFail06_A’ is redundant
       except perhaps to import instances from ‘OverloadedRecFldsFail06_A’
     To import instances alone, use: import OverloadedRecFldsFail06_A()
 
-overloadedrecfldsfail06.hs:9:1: error: [-Wunused-imports (in -Wextra), Werror=unused-imports]
+overloadedrecfldsfail06.hs:9:1: error: [GHC-38856] [-Wunused-imports (in -Wextra), Werror=unused-imports]
     The qualified import of ‘V(y)’
     from module ‘OverloadedRecFldsFail06_A’ is redundant
 
-overloadedrecfldsfail06.hs:10:1: error: [-Wunused-imports (in -Wextra), Werror=unused-imports]
+overloadedrecfldsfail06.hs:10:1: error: [GHC-38856] [-Wunused-imports (in -Wextra), Werror=unused-imports]
     The qualified import of ‘U, U(x)’
     from module ‘OverloadedRecFldsFail06_A’ is redundant
 
diff --git a/testsuite/tests/patsyn/should_compile/T9975a.stderr b/testsuite/tests/patsyn/should_compile/T9975a.stderr
index faddb2a3e5..8723833ce0 100644
--- a/testsuite/tests/patsyn/should_compile/T9975a.stderr
+++ b/testsuite/tests/patsyn/should_compile/T9975a.stderr
@@ -1,5 +1,5 @@
 
-T9975a.hs:6:1:
+T9975a.hs:6:1: [GHC-29916]
     Multiple declarations of ‘Test’
     Declared at: T9975a.hs:5:13
                  T9975a.hs:6:1
diff --git a/testsuite/tests/rename/should_compile/T13064.stderr b/testsuite/tests/rename/should_compile/T13064.stderr
index a94e5b70d5..8716be11fd 100644
--- a/testsuite/tests/rename/should_compile/T13064.stderr
+++ b/testsuite/tests/rename/should_compile/T13064.stderr
@@ -1,3 +1,3 @@
 
-T13064.hs:5:21: warning: [-Wunused-imports (in -Wextra)]
+T13064.hs:5:21: warning: [GHC-38856] [-Wunused-imports (in -Wextra)]
     The import of ‘pure’ from module ‘Prelude’ is redundant
diff --git a/testsuite/tests/rename/should_compile/T14881.stderr b/testsuite/tests/rename/should_compile/T14881.stderr
index bfb6ca913f..2e3ff2b406 100644
--- a/testsuite/tests/rename/should_compile/T14881.stderr
+++ b/testsuite/tests/rename/should_compile/T14881.stderr
@@ -1,6 +1,6 @@
 [1 of 2] Compiling T14881Aux        ( T14881Aux.hs, T14881Aux.o )
 [2 of 2] Compiling T14881           ( T14881.hs, T14881.o )
 
-T14881.hs:3:1: warning: [-Wunused-imports (in -Wextra)]
+T14881.hs:3:1: warning: [GHC-38856] [-Wunused-imports (in -Wextra)]
     The qualified import of ‘adjust, length, L(tail), L(x)’
     from module ‘T14881Aux’ is redundant
diff --git a/testsuite/tests/rename/should_compile/T17244A.stderr b/testsuite/tests/rename/should_compile/T17244A.stderr
index 621e9439f1..3ba54e4a17 100644
--- a/testsuite/tests/rename/should_compile/T17244A.stderr
+++ b/testsuite/tests/rename/should_compile/T17244A.stderr
@@ -1,5 +1,5 @@
 
-T17244A.hs:6:8: warning: [-Wcompat-unqualified-imports (in -Wcompat)]
+T17244A.hs:6:8: warning: [GHC-82347] [-Wcompat-unqualified-imports (in -Wcompat)]
     To ensure compatibility with future core libraries changes
     imports to Data.List should be
     either qualified or have an explicit import list.
diff --git a/testsuite/tests/rename/should_compile/T1789.stderr b/testsuite/tests/rename/should_compile/T1789.stderr
index 9941f21ec6..afb5a90cf8 100644
--- a/testsuite/tests/rename/should_compile/T1789.stderr
+++ b/testsuite/tests/rename/should_compile/T1789.stderr
@@ -1,12 +1,12 @@
 
-T1789.hs:6:1: warning: [-Wmissing-import-lists]
+T1789.hs:6:1: warning: [GHC-16029] [-Wmissing-import-lists]
     The module ‘Prelude’ does not have an explicit import list
 
-T1789.hs:7:1: warning: [-Wmissing-import-lists]
+T1789.hs:7:1: warning: [GHC-16029] [-Wmissing-import-lists]
     The module ‘Data.Map’ does not have an explicit import list
 
 T1789.hs:9:20: warning: [GHC-77037] [-Wmissing-import-lists]
     The import item ‘Maybe(..)’ does not have an explicit import list
 
-T1789.hs:10:1: warning: [-Wmissing-import-lists]
+T1789.hs:10:1: warning: [GHC-16029] [-Wmissing-import-lists]
     The module ‘Data.Maybe’ does not have an explicit import list
diff --git a/testsuite/tests/rename/should_compile/T4489.stderr b/testsuite/tests/rename/should_compile/T4489.stderr
index b4ad5cd093..826fdba28a 100644
--- a/testsuite/tests/rename/should_compile/T4489.stderr
+++ b/testsuite/tests/rename/should_compile/T4489.stderr
@@ -1,5 +1,5 @@
 
-T4489.hs:4:1: warning: [-Wmissing-import-lists]
+T4489.hs:4:1: warning: [GHC-16029] [-Wmissing-import-lists]
     The module ‘Data.Maybe’ does not have an explicit import list
 
 T4489.hs:5:20: warning: [GHC-77037] [-Wmissing-import-lists]
diff --git a/testsuite/tests/rename/should_compile/rn037.stderr b/testsuite/tests/rename/should_compile/rn037.stderr
index c386e896de..e2d6216ebc 100644
--- a/testsuite/tests/rename/should_compile/rn037.stderr
+++ b/testsuite/tests/rename/should_compile/rn037.stderr
@@ -1,5 +1,5 @@
 
-rn037.hs:3:1: warning: [-Wunused-imports (in -Wextra)]
+rn037.hs:3:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘Data.Tuple’ is redundant
       except perhaps to import instances from ‘Data.Tuple’
     To import instances alone, use: import Data.Tuple()
diff --git a/testsuite/tests/rename/should_compile/rn046.stderr b/testsuite/tests/rename/should_compile/rn046.stderr
index e1947d914d..227b09e6e1 100644
--- a/testsuite/tests/rename/should_compile/rn046.stderr
+++ b/testsuite/tests/rename/should_compile/rn046.stderr
@@ -1,8 +1,8 @@
 
-rn046.hs:2:1: warning: [-Wunused-imports (in -Wextra)]
+rn046.hs:2:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘Data.List’ is redundant
       except perhaps to import instances from ‘Data.List’
     To import instances alone, use: import Data.List()
 
-rn046.hs:3:19: warning: [-Wunused-imports (in -Wextra)]
+rn046.hs:3:19: warning: [GHC-38856] [-Wunused-imports (in -Wextra)]
     The import of ‘ord’ from module ‘Data.Char’ is redundant
diff --git a/testsuite/tests/rename/should_fail/ImportLookupIllegal.hs b/testsuite/tests/rename/should_fail/ImportLookupIllegal.hs
new file mode 100644
index 0000000000..f1bdacadcf
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/ImportLookupIllegal.hs
@@ -0,0 +1,3 @@
+module ImportLookupIllegal where
+
+import Control.Concurrent (module Control.Concurrent.MVar)
diff --git a/testsuite/tests/rename/should_fail/ImportLookupIllegal.stderr b/testsuite/tests/rename/should_fail/ImportLookupIllegal.stderr
new file mode 100644
index 0000000000..6e4ab849fb
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/ImportLookupIllegal.stderr
@@ -0,0 +1 @@
+ImportLookupIllegal.hs:3:28: [GHC-14752] Illegal import item
diff --git a/testsuite/tests/rename/should_fail/PackageImportsDisabled.hs b/testsuite/tests/rename/should_fail/PackageImportsDisabled.hs
new file mode 100644
index 0000000000..0a3faca96c
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/PackageImportsDisabled.hs
@@ -0,0 +1,3 @@
+module PackageImportsDisabled where
+
+import "base" Data.Char
diff --git a/testsuite/tests/rename/should_fail/PackageImportsDisabled.stderr b/testsuite/tests/rename/should_fail/PackageImportsDisabled.stderr
new file mode 100644
index 0000000000..63499309b6
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/PackageImportsDisabled.stderr
@@ -0,0 +1,3 @@
+PackageImportsDisabled.hs:3:1: [GHC-10032]
+    Package-qualified imports are not enabled
+    Suggested fix: Perhaps you intended to use PackageImports
diff --git a/testsuite/tests/rename/should_fail/T3792.stderr b/testsuite/tests/rename/should_fail/T3792.stderr
index 964ea2ea8b..a8cd4670ae 100644
--- a/testsuite/tests/rename/should_fail/T3792.stderr
+++ b/testsuite/tests/rename/should_fail/T3792.stderr
@@ -1,3 +1,3 @@
 
-T3792.hs:3:17: error:
+T3792.hs:3:17: error: [GHC-48795]
     Illegal qualified name in import item: Prelude.map
diff --git a/testsuite/tests/rename/should_fail/T5211.stderr b/testsuite/tests/rename/should_fail/T5211.stderr
index dc02ab4085..cca888e9de 100644
--- a/testsuite/tests/rename/should_fail/T5211.stderr
+++ b/testsuite/tests/rename/should_fail/T5211.stderr
@@ -1,5 +1,5 @@
 
-T5211.hs:5:1: warning: [-Wunused-imports (in -Wextra)]
+T5211.hs:5:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The qualified import of ‘Foreign.Storable’ is redundant
       except perhaps to import instances from ‘Foreign.Storable’
     To import instances alone, use: import Foreign.Storable()
diff --git a/testsuite/tests/rename/should_fail/T7164.stderr b/testsuite/tests/rename/should_fail/T7164.stderr
index 8049b27cde..732f8a1040 100644
--- a/testsuite/tests/rename/should_fail/T7164.stderr
+++ b/testsuite/tests/rename/should_fail/T7164.stderr
@@ -1,5 +1,5 @@
 
-T7164.hs:8:1:
+T7164.hs:8:1: [GHC-29916]
     Multiple declarations of ‘derp’
     Declared at: T7164.hs:5:5
                  T7164.hs:8:1
diff --git a/testsuite/tests/rename/should_fail/T7454.stderr b/testsuite/tests/rename/should_fail/T7454.stderr
index ba9666cf35..2eb477b9ff 100644
--- a/testsuite/tests/rename/should_fail/T7454.stderr
+++ b/testsuite/tests/rename/should_fail/T7454.stderr
@@ -1,3 +1,3 @@
 
-T7454.hs:5:23: warning: [-Wunused-imports (in -Wextra)]
+T7454.hs:5:23: warning: [GHC-38856] [-Wunused-imports (in -Wextra)]
     The import of ‘Arrow’ from module ‘Control.Arrow’ is redundant
diff --git a/testsuite/tests/rename/should_fail/T8149.stderr b/testsuite/tests/rename/should_fail/T8149.stderr
index 33b45e9598..c25cd8eb87 100644
--- a/testsuite/tests/rename/should_fail/T8149.stderr
+++ b/testsuite/tests/rename/should_fail/T8149.stderr
@@ -1,4 +1,4 @@
 
-T8149.hs:5:36: warning: [-Wunused-imports (in -Wextra)]
+T8149.hs:5:36: warning: [GHC-38856] [-Wunused-imports (in -Wextra)]
     The import of ‘WriterT’
     from module ‘Control.Monad.Trans.Writer’ is redundant
diff --git a/testsuite/tests/rename/should_fail/T9032.stderr b/testsuite/tests/rename/should_fail/T9032.stderr
index 21af9ac713..b64e7f0e26 100644
--- a/testsuite/tests/rename/should_fail/T9032.stderr
+++ b/testsuite/tests/rename/should_fail/T9032.stderr
@@ -1,2 +1,3 @@
 
-T9032.hs:6:1: A module cannot import itself: T9032
+T9032.hs:6:1: [GHC-43281]
+    A module cannot import itself: T9032
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index 53f6028f9c..7ea8d6fd3a 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -195,3 +195,5 @@ test('RnDefaultSigFail', normal, compile_fail, [''])
 test('RnMultipleMinimalPragmaFail', normal, compile_fail, [''])
 test('RnUnexpectedStandaloneDeriving', normal, compile_fail, [''])
 test('RnStupidThetaInGadt', normal, compile_fail, [''])
+test('PackageImportsDisabled', normal, compile_fail, [''])
+test('ImportLookupIllegal', normal, compile_fail, [''])
diff --git a/testsuite/tests/rename/should_fail/rn_dup.stderr b/testsuite/tests/rename/should_fail/rn_dup.stderr
index 907fc38fe8..7ebcb0ec33 100644
--- a/testsuite/tests/rename/should_fail/rn_dup.stderr
+++ b/testsuite/tests/rename/should_fail/rn_dup.stderr
@@ -1,10 +1,10 @@
 
-rn_dup.hs:9:10: error:
+rn_dup.hs:9:10: error: [GHC-29916]
     Multiple declarations of ‘MkT’
     Declared at: rn_dup.hs:7:16
                  rn_dup.hs:9:10
 
-rn_dup.hs:9:10: error:
+rn_dup.hs:9:10: error: [GHC-29916]
     Multiple declarations of ‘MkT’
     Declared at: rn_dup.hs:7:10
                  rn_dup.hs:9:10
@@ -12,17 +12,17 @@ rn_dup.hs:9:10: error:
 rn_dup.hs:11:27: error: [GHC-85524]
     Duplicate field name ‘rf’ in record declaration
 
-rn_dup.hs:12:16: error:
+rn_dup.hs:12:16: error: [GHC-29916]
     Multiple declarations of ‘rf’
     Declared at: rn_dup.hs:11:27
                  rn_dup.hs:12:16
 
-rn_dup.hs:17:3: error:
+rn_dup.hs:17:3: error: [GHC-29916]
     Multiple declarations of ‘CT’
     Declared at: rn_dup.hs:15:3
                  rn_dup.hs:17:3
 
-rn_dup.hs:18:3: error:
+rn_dup.hs:18:3: error: [GHC-29916]
     Multiple declarations of ‘f’
     Declared at: rn_dup.hs:16:3
                  rn_dup.hs:18:3
diff --git a/testsuite/tests/rename/should_fail/rnfail002.stderr b/testsuite/tests/rename/should_fail/rnfail002.stderr
index ffa05e767d..f68952bd4f 100644
--- a/testsuite/tests/rename/should_fail/rnfail002.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail002.stderr
@@ -1,5 +1,5 @@
 
-rnfail002.hs:6:1:
+rnfail002.hs:6:1: [GHC-29916]
     Multiple declarations of ‘y’
     Declared at: rnfail002.hs:5:1
                  rnfail002.hs:6:1
diff --git a/testsuite/tests/rename/should_fail/rnfail003.stderr b/testsuite/tests/rename/should_fail/rnfail003.stderr
index 24c74a6cbb..8d5d8183ea 100644
--- a/testsuite/tests/rename/should_fail/rnfail003.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail003.stderr
@@ -1,5 +1,5 @@
 
-rnfail003.hs:4:1:
+rnfail003.hs:4:1: [GHC-29916]
     Multiple declarations of ‘f’
     Declared at: rnfail003.hs:2:1
                  rnfail003.hs:4:1
diff --git a/testsuite/tests/rename/should_fail/rnfail009.stderr b/testsuite/tests/rename/should_fail/rnfail009.stderr
index d8d3fa5fcc..dcd35ef164 100644
--- a/testsuite/tests/rename/should_fail/rnfail009.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail009.stderr
@@ -1,5 +1,5 @@
 
-rnfail009.hs:5:10:
+rnfail009.hs:5:10: [GHC-29916]
     Multiple declarations of ‘A’
     Declared at: rnfail009.hs:3:10
                  rnfail009.hs:5:10
diff --git a/testsuite/tests/rename/should_fail/rnfail010.stderr b/testsuite/tests/rename/should_fail/rnfail010.stderr
index bd20f39188..7bfedd4b23 100644
--- a/testsuite/tests/rename/should_fail/rnfail010.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail010.stderr
@@ -1,5 +1,5 @@
 
-rnfail010.hs:6:1:
+rnfail010.hs:6:1: [GHC-29916]
     Multiple declarations of ‘f’
     Declared at: rnfail010.hs:2:1
                  rnfail010.hs:6:1
diff --git a/testsuite/tests/rename/should_fail/rnfail011.stderr b/testsuite/tests/rename/should_fail/rnfail011.stderr
index 0d55b36f50..2a15ab2dc4 100644
--- a/testsuite/tests/rename/should_fail/rnfail011.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail011.stderr
@@ -1,5 +1,5 @@
 
-rnfail011.hs:6:1:
+rnfail011.hs:6:1: [GHC-29916]
     Multiple declarations of ‘A’
     Declared at: rnfail011.hs:2:1
                  rnfail011.hs:6:1
diff --git a/testsuite/tests/rename/should_fail/rnfail012.stderr b/testsuite/tests/rename/should_fail/rnfail012.stderr
index 833256a1ca..a0d2293249 100644
--- a/testsuite/tests/rename/should_fail/rnfail012.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail012.stderr
@@ -1,5 +1,5 @@
 
-rnfail012.hs:8:1:
+rnfail012.hs:8:1: [GHC-29916]
     Multiple declarations of ‘A’
     Declared at: rnfail012.hs:2:1
                  rnfail012.hs:8:1
diff --git a/testsuite/tests/rename/should_fail/rnfail013.stderr b/testsuite/tests/rename/should_fail/rnfail013.stderr
index ae2ead8fc4..fbd225456b 100644
--- a/testsuite/tests/rename/should_fail/rnfail013.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail013.stderr
@@ -1,5 +1,5 @@
 
-rnfail013.hs:7:11:
+rnfail013.hs:7:11: [GHC-29916]
     Multiple declarations of ‘MkT’
     Declared at: rnfail013.hs:5:11
                  rnfail013.hs:7:11
diff --git a/testsuite/tests/rename/should_fail/rnfail015.stderr b/testsuite/tests/rename/should_fail/rnfail015.stderr
index 8edd5e3740..2d92dcf859 100644
--- a/testsuite/tests/rename/should_fail/rnfail015.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail015.stderr
@@ -1,5 +1,5 @@
 
-rnfail015.hs:14:9:
+rnfail015.hs:14:9: [GHC-29916]
     Multiple declarations of ‘TokLiteral’
     Declared at: rnfail015.hs:8:9
                  rnfail015.hs:14:9
diff --git a/testsuite/tests/rename/should_fail/rnfail043.stderr b/testsuite/tests/rename/should_fail/rnfail043.stderr
index 3547ac55b9..7c3d1f3ed7 100644
--- a/testsuite/tests/rename/should_fail/rnfail043.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail043.stderr
@@ -1,5 +1,5 @@
 
-rnfail043.hs:10:1:
+rnfail043.hs:10:1: [GHC-29916]
     Multiple declarations of ‘f’
     Declared at: rnfail043.hs:6:1
                  rnfail043.hs:10:1
diff --git a/testsuite/tests/safeHaskell/safeInfered/Mixed01.stderr b/testsuite/tests/safeHaskell/safeInfered/Mixed01.stderr
index 1d8bcf1cd4..eff0bf7a43 100644
--- a/testsuite/tests/safeHaskell/safeInfered/Mixed01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/Mixed01.stderr
@@ -1,4 +1,5 @@
 
-Mixed01.hs:5:1:
+Mixed01.hs:5:1: [GHC-26971]
     safe import can't be used as Safe Haskell isn't on!
-    please enable Safe Haskell through either Safe, Trustworthy or Unsafe
+    Suggested fix:
+      Enable Safe Haskell through either Safe, Trustworthy or Unsafe.
diff --git a/testsuite/tests/th/T8932.stderr b/testsuite/tests/th/T8932.stderr
index 4dbbfe620a..82d94d79fe 100644
--- a/testsuite/tests/th/T8932.stderr
+++ b/testsuite/tests/th/T8932.stderr
@@ -1,5 +1,5 @@
 
-T8932.hs:11:1: error:
+T8932.hs:11:1: error: [GHC-29916]
     Multiple declarations of ‘foo’
     Declared at: T8932.hs:5:2
                  T8932.hs:11:1
diff --git a/testsuite/tests/th/TH_dupdecl.stderr b/testsuite/tests/th/TH_dupdecl.stderr
index c44ba63098..089d8c1552 100644
--- a/testsuite/tests/th/TH_dupdecl.stderr
+++ b/testsuite/tests/th/TH_dupdecl.stderr
@@ -1,5 +1,5 @@
 
-TH_dupdecl.hs:10:2: error:
+TH_dupdecl.hs:10:2: error: [GHC-29916]
     Multiple declarations of ‘x’
     Declared at: TH_dupdecl.hs:8:2
                  TH_dupdecl.hs:10:2
diff --git a/testsuite/tests/type-data/should_fail/TDMultiple01.stderr b/testsuite/tests/type-data/should_fail/TDMultiple01.stderr
index 5b3abe33ed..265c21c28b 100644
--- a/testsuite/tests/type-data/should_fail/TDMultiple01.stderr
+++ b/testsuite/tests/type-data/should_fail/TDMultiple01.stderr
@@ -1,5 +1,5 @@
 
-TDMultiple01.hs:5:18:
+TDMultiple01.hs:5:18: [GHC-29916]
     Multiple declarations of ‘P’
     Declared at: TDMultiple01.hs:4:1
                  TDMultiple01.hs:5:18
diff --git a/testsuite/tests/type-data/should_fail/TDMultiple02.stderr b/testsuite/tests/type-data/should_fail/TDMultiple02.stderr
index c08709fa8c..8b1520c1ea 100644
--- a/testsuite/tests/type-data/should_fail/TDMultiple02.stderr
+++ b/testsuite/tests/type-data/should_fail/TDMultiple02.stderr
@@ -1,5 +1,5 @@
 
-TDMultiple02.hs:5:18:
+TDMultiple02.hs:5:18: [GHC-29916]
     Multiple declarations of ‘P’
     Declared at: TDMultiple02.hs:4:1
                  TDMultiple02.hs:5:18
diff --git a/testsuite/tests/type-data/should_fail/TDPunning.stderr b/testsuite/tests/type-data/should_fail/TDPunning.stderr
index 95ddbf51d3..6320a0d56d 100644
--- a/testsuite/tests/type-data/should_fail/TDPunning.stderr
+++ b/testsuite/tests/type-data/should_fail/TDPunning.stderr
@@ -1,5 +1,5 @@
 
-TDPunning.hs:4:15:
+TDPunning.hs:4:15: [GHC-29916]
     Multiple declarations of ‘T’
     Declared at: TDPunning.hs:4:1
                  TDPunning.hs:4:15
diff --git a/testsuite/tests/warnings/should_compile/DeprU.stderr b/testsuite/tests/warnings/should_compile/DeprU.stderr
index a458dc4f2b..9de0ab31ff 100644
--- a/testsuite/tests/warnings/should_compile/DeprU.stderr
+++ b/testsuite/tests/warnings/should_compile/DeprU.stderr
@@ -1,7 +1,7 @@
 [1 of 2] Compiling DeprM            ( DeprM.hs, DeprM.o )
 [2 of 2] Compiling A                ( DeprU.hs, DeprU.o )
 
-DeprU.hs:3:1: warning: [-Wdeprecations (in -Wextended-warnings)]
+DeprU.hs:3:1: warning: [GHC-15328] [-Wdeprecations (in -Wextended-warnings)]
     Module ‘DeprM’ is deprecated:
       "Here can be your menacing deprecation warning!"
 
diff --git a/testsuite/tests/warnings/should_compile/DodgyImports.hs b/testsuite/tests/warnings/should_compile/DodgyImports.hs
new file mode 100644
index 0000000000..2361832409
--- /dev/null
+++ b/testsuite/tests/warnings/should_compile/DodgyImports.hs
@@ -0,0 +1,3 @@
+module DodgyImports where
+
+import Data.Semigroup (ArgMin (..))
diff --git a/testsuite/tests/warnings/should_compile/DodgyImports.stderr b/testsuite/tests/warnings/should_compile/DodgyImports.stderr
new file mode 100644
index 0000000000..de90c743f2
--- /dev/null
+++ b/testsuite/tests/warnings/should_compile/DodgyImports.stderr
@@ -0,0 +1,4 @@
+DodgyImports.hs:3:24: warning: [GHC-99623] [-Wdodgy-imports (in -Wextra)]
+    The import item ‘Data.Semigroup.ArgMin(..)’ suggests that
+    ‘Data.Semigroup.ArgMin’ has (in-scope) constructors or record fields,
+                                but it has none
diff --git a/testsuite/tests/warnings/should_compile/DodgyImports_hiding.hs b/testsuite/tests/warnings/should_compile/DodgyImports_hiding.hs
new file mode 100644
index 0000000000..e810b3cf27
--- /dev/null
+++ b/testsuite/tests/warnings/should_compile/DodgyImports_hiding.hs
@@ -0,0 +1,3 @@
+module DodgyImports_hiding where
+
+import Data.Semigroup hiding (ArgMin (..))
diff --git a/testsuite/tests/warnings/should_compile/DodgyImports_hiding.stderr b/testsuite/tests/warnings/should_compile/DodgyImports_hiding.stderr
new file mode 100644
index 0000000000..4a30f78b16
--- /dev/null
+++ b/testsuite/tests/warnings/should_compile/DodgyImports_hiding.stderr
@@ -0,0 +1,4 @@
+DodgyImports_hiding.hs:3:31: warning: [GHC-99623] [-Wdodgy-imports (in -Wextra)]
+    The import item ‘Data.Semigroup.ArgMin(..)’ suggests that
+    ‘Data.Semigroup.ArgMin’ has (in-scope) constructors or record fields,
+                                but it has none
diff --git a/testsuite/tests/warnings/should_compile/T10890/T10890_2.stderr b/testsuite/tests/warnings/should_compile/T10890/T10890_2.stderr
index d676ca9556..3b803dfec3 100644
--- a/testsuite/tests/warnings/should_compile/T10890/T10890_2.stderr
+++ b/testsuite/tests/warnings/should_compile/T10890/T10890_2.stderr
@@ -1,5 +1,5 @@
 
-T10890_2.hs:12:1: warning: [-Wunused-imports (in -Wextra)]
+T10890_2.hs:12:1: warning: [GHC-66111] [-Wunused-imports (in -Wextra)]
     The import of ‘T10890_2B’ is redundant
       except perhaps to import instances from ‘T10890_2B’
     To import instances alone, use: import T10890_2B()
diff --git a/testsuite/tests/warnings/should_compile/all.T b/testsuite/tests/warnings/should_compile/all.T
index 0c8c2f6a5d..f001e40164 100644
--- a/testsuite/tests/warnings/should_compile/all.T
+++ b/testsuite/tests/warnings/should_compile/all.T
@@ -60,3 +60,5 @@ test('T20312', normal, compile,['-Wall'])
 test('T22151', normal, compile, ['-Wredundant-constraints'])
 test('T22759', normal, compile, [''])
 test('T22676', [extra_files(['src'])], multimod_compile, ['src.hs', '-working-dir src -Wmissing-home-modules -v0'])
+test('DodgyImports', normal, compile, ['-Wdodgy-imports'])
+test('DodgyImports_hiding', normal, compile, ['-Wdodgy-imports'])
diff --git a/testsuite/tests/warnings/should_fail/WarningCategory1.stderr b/testsuite/tests/warnings/should_fail/WarningCategory1.stderr
index 1d86cedab1..95148407a4 100644
--- a/testsuite/tests/warnings/should_fail/WarningCategory1.stderr
+++ b/testsuite/tests/warnings/should_fail/WarningCategory1.stderr
@@ -1,5 +1,5 @@
 
-WarningCategory1.hs:4:1: error: [-Wx-module-warning-42 (in -Wextended-warnings), -Werror=x-module-warning-42]
+WarningCategory1.hs:4:1: error: [GHC-15328] [-Wx-module-warning-42 (in -Wextended-warnings), -Werror=x-module-warning-42]
     Module ‘WarningCategoryModule’: "Module-level warning"
 
 WarningCategory1.hs:7:8: error: [GHC-63394] [-Wx-dangerous (in -Wextended-warnings), -Werror=x-dangerous]
diff --git a/testsuite/tests/warnings/should_fail/WarningCategory2.stderr b/testsuite/tests/warnings/should_fail/WarningCategory2.stderr
index 6b8faed762..af2e9aa5e2 100644
--- a/testsuite/tests/warnings/should_fail/WarningCategory2.stderr
+++ b/testsuite/tests/warnings/should_fail/WarningCategory2.stderr
@@ -1,5 +1,5 @@
 
-WarningCategory1.hs:4:1: error: [-Wx-module-warning-42 (in -Wextended-warnings), -Werror=x-module-warning-42]
+WarningCategory1.hs:4:1: error: [GHC-15328] [-Wx-module-warning-42 (in -Wextended-warnings), -Werror=x-module-warning-42]
     Module ‘WarningCategoryModule’: "Module-level warning"
 
 WarningCategory1.hs:7:8: error: [GHC-63394] [-Wx-dangerous (in -Wextended-warnings), -Werror=x-dangerous]
diff --git a/testsuite/tests/warnings/should_fail/WarningCategory5.stderr b/testsuite/tests/warnings/should_fail/WarningCategory5.stderr
index 536a40bc25..aa10de3563 100644
--- a/testsuite/tests/warnings/should_fail/WarningCategory5.stderr
+++ b/testsuite/tests/warnings/should_fail/WarningCategory5.stderr
@@ -1,5 +1,5 @@
 
-WarningCategory1.hs:4:1: warning: [-Wx-module-warning-42 (in -Wextended-warnings)]
+WarningCategory1.hs:4:1: warning: [GHC-15328] [-Wx-module-warning-42 (in -Wextended-warnings)]
     Module ‘WarningCategoryModule’: "Module-level warning"
 
 WarningCategory1.hs:7:8: error: [GHC-63394] [-Wx-dangerous (in -Wextended-warnings), -Werror=x-dangerous]
diff --git a/testsuite/tests/warnings/should_fail/WarningCategory7.stderr b/testsuite/tests/warnings/should_fail/WarningCategory7.stderr
index 1d86cedab1..95148407a4 100644
--- a/testsuite/tests/warnings/should_fail/WarningCategory7.stderr
+++ b/testsuite/tests/warnings/should_fail/WarningCategory7.stderr
@@ -1,5 +1,5 @@
 
-WarningCategory1.hs:4:1: error: [-Wx-module-warning-42 (in -Wextended-warnings), -Werror=x-module-warning-42]
+WarningCategory1.hs:4:1: error: [GHC-15328] [-Wx-module-warning-42 (in -Wextended-warnings), -Werror=x-module-warning-42]
     Module ‘WarningCategoryModule’: "Module-level warning"
 
 WarningCategory1.hs:7:8: error: [GHC-63394] [-Wx-dangerous (in -Wextended-warnings), -Werror=x-dangerous]