summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorTorsten Schmits <git@tryp.io>2023-03-14 13:46:59 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2023-03-17 14:36:49 -0400
commit73d07c6e1986bd2b3516d4f009cc1e30ba804f06 (patch)
tree8be1ce674ba675db5b184e8277fc0e6c45c843a5 /testsuite
parent19d6d0397c223bbec3c372d2b8c04c2e356c44a8 (diff)
downloadhaskell-73d07c6e1986bd2b3516d4f009cc1e30ba804f06.tar.gz
Add structured error messages for GHC.Tc.Utils.Backpack
Tracking ticket: #20119 MR: !10127 This converts uses of `mkTcRnUnknownMessage` to newly added constructors of `TcRnMessage`. One occurrence, when handing a nested error from the interface loading machinery, was omitted. It will be handled by a subsequent changeset that addresses interface errors.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.stderr2
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail01.stderr4
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail05.stderr2
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail09.stderr4
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail16.stderr2
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail20.stderr2
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail21.stderr2
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail35.stderr2
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail37.stderr2
-rw-r--r--testsuite/tests/backpack/should_fail/bkpfail38.stderr2
10 files changed, 12 insertions, 12 deletions
diff --git a/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.stderr b/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.stderr
index a266829205..24defef3c5 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.stderr
+++ b/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.stderr
@@ -1,4 +1,4 @@
-sig/P.hsig:1:1: error:
+sig/P.hsig:1:1: error: [GHC-93011]
• ‘p’ is exported by the hsig file, but not exported by the implementing module ‘bkpcabal06-0.1.0.0:impl:P’
• while checking that bkpcabal06-0.1.0.0:impl:P implements signature P in bkpcabal06-0.1.0.0:sig[P=bkpcabal06-0.1.0.0:impl:P]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail01.stderr b/testsuite/tests/backpack/should_fail/bkpfail01.stderr
index e88d122fa4..7197fa3eb2 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail01.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail01.stderr
@@ -10,10 +10,10 @@
Instantiating p[H=q:H]
[1 of 2] Compiling H[sig] ( p/H.hsig, nothing )
-bkpfail01.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/../H.hi:1:1: error:
+bkpfail01.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/../H.hi:1:1: error: [GHC-93011]
• ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’
• while checking that q:H implements signature H in p[H=q:H]
-bkpfail01.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/../H.hi:1:1: error:
+bkpfail01.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/../H.hi:1:1: error: [GHC-93011]
• ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’
• while checking that q:H implements signature H in p[H=q:H]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail05.stderr b/testsuite/tests/backpack/should_fail/bkpfail05.stderr
index da996cfb7e..c07426fc6b 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail05.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail05.stderr
@@ -18,6 +18,6 @@
Instantiating h[H=h-impl:H]
[1 of 1] Compiling H[sig] ( h/H.hsig, bkpfail05.out/h/h-5FYQgnNkfSvBT5yogOxPpf/H.o )
-bkpfail05.out/h/h-5FYQgnNkfSvBT5yogOxPpf/../H.hi:1:1: error:
+bkpfail05.out/h/h-5FYQgnNkfSvBT5yogOxPpf/../H.hi:1:1: error: [GHC-93011]
• ‘T1’ is exported by the hsig file, but not exported by the implementing module ‘h-impl:H’
• while checking that h-impl:H implements signature H in h[H=h-impl:H]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail09.stderr b/testsuite/tests/backpack/should_fail/bkpfail09.stderr
index de1d100a34..858f292001 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail09.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail09.stderr
@@ -8,10 +8,10 @@
[1 of 3] Compiling H2[sig] ( r/H2.hsig, nothing )
[2 of 3] Instantiating p
-Command line argument: -unit-id p[H=H]:0:0: error:
+Command line argument: -unit-id p[H=H]:0:0: error: [GHC-93011]
• ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’
• while checking that q:H implements signature H in p[H=q:H]
-Command line argument: -unit-id p[H=H]:0:0: error:
+Command line argument: -unit-id p[H=H]:0:0: error: [GHC-93011]
• ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’
• while checking that q:H implements signature H in p[H=q:H]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail16.stderr b/testsuite/tests/backpack/should_fail/bkpfail16.stderr
index b3bea76954..af4d241106 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail16.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail16.stderr
@@ -6,6 +6,6 @@
Instantiating p[ShouldFail=base-4.13.0.0:Data.Bool]
[1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/ShouldFail.o )
-bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/../ShouldFail.hi:1:1: error:
+bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/../ShouldFail.hi:1:1: error: [GHC-93011]
• ‘Booly’ is exported by the hsig file, but not exported by the implementing module ‘Data.Bool’
• while checking that Data.Bool implements signature ShouldFail in p[ShouldFail=Data.Bool]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail20.stderr b/testsuite/tests/backpack/should_fail/bkpfail20.stderr
index bd450f9f8c..799d58a44b 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail20.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail20.stderr
@@ -5,7 +5,7 @@
[3 of 3] Processing r
[1 of 3] Compiling B[sig] ( r/B.hsig, nothing )
-bkpfail20.bkp:1:1: error:
+bkpfail20.bkp:1:1: error: [GHC-93009]
• While merging export lists, could not unify Data.STRef.Lazy.newSTRef with GHC.STRef.newSTRef
• while merging the signatures from:
• p[A=<B>]:A
diff --git a/testsuite/tests/backpack/should_fail/bkpfail21.stderr b/testsuite/tests/backpack/should_fail/bkpfail21.stderr
index bc40bbc344..72444b2fd2 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail21.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail21.stderr
@@ -9,7 +9,7 @@
[2 of 5] Compiling H1[sig] ( r/H1.hsig, nothing )
[3 of 5] Compiling H3[sig] ( r/H3.hsig, nothing )
-bkpfail21.bkp:1:1: error:
+bkpfail21.bkp:1:1: error: [GHC-93009]
• While merging export lists, could not unify {H1.T} with {H2.T}
Neither name variable originates from the current signature.
• while merging the signatures from:
diff --git a/testsuite/tests/backpack/should_fail/bkpfail35.stderr b/testsuite/tests/backpack/should_fail/bkpfail35.stderr
index 893a8dd2ae..f72bd23184 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail35.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail35.stderr
@@ -13,6 +13,6 @@
Instantiating q[A=aimpl:A]
[1 of 1] Compiling A[sig] ( q/A.hsig, bkpfail35.out/q/q-E72T6bb4XRkIeTPWK2mCKa/A.o )
-bkpfail35.out/q/q-E72T6bb4XRkIeTPWK2mCKa/../A.hi:1:1: error:
+bkpfail35.out/q/q-E72T6bb4XRkIeTPWK2mCKa/../A.hi:1:1: error: [GHC-93011]
• ‘y’ is exported by the hsig file, but not exported by the implementing module ‘aimpl:A’
• while checking that aimpl:A implements signature A in q[A=aimpl:A]
diff --git a/testsuite/tests/backpack/should_fail/bkpfail37.stderr b/testsuite/tests/backpack/should_fail/bkpfail37.stderr
index a10c05fbeb..4158517b28 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail37.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail37.stderr
@@ -9,7 +9,7 @@
Instantiating p[A=q:A]
[1 of 1] Compiling A[sig] ( p/A.hsig, bkpfail37.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o )
-bkpfail37.bkp:9:9: error:
+bkpfail37.bkp:9:9: error: [GHC-93007]
• Identifier ‘op’ has conflicting fixities in the module
and its hsig file
Main module: infixr 4
diff --git a/testsuite/tests/backpack/should_fail/bkpfail38.stderr b/testsuite/tests/backpack/should_fail/bkpfail38.stderr
index 264e150783..41c713925b 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail38.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail38.stderr
@@ -5,7 +5,7 @@
[3 of 3] Processing r
[1 of 3] Compiling A[sig] ( r/A.hsig, nothing )
-bkpfail38.bkp:8:9: error:
+bkpfail38.bkp:8:9: error: [GHC-93007]
• Identifier ‘op’ has conflicting fixities in the module
and its hsig file
Main module: infixr 4