diff options
| author | sheaf <sam.derbyshire@gmail.com> | 2023-05-15 15:23:49 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-05-15 18:03:00 -0400 |
| commit | 4d29ecdfcc79ad663e066d9f7d6d17b64c8c6c41 (patch) | |
| tree | 985890c63aee54a2e94e31aa85cbec44652987b9 /testsuite/tests/backpack/should_fail/bkpfail53.stderr | |
| parent | d69cbd78999071d2d6479be40ae90ddd83b9942a (diff) | |
| download | haskell-4d29ecdfcc79ad663e066d9f7d6d17b64c8c6c41.tar.gz | |
Migrate errors to diagnostics in GHC.Tc.Module
This commit migrates the errors in GHC.Tc.Module to use the new
diagnostic infrastructure.
It required a significant overhaul of the compatibility checks between
an hs-boot or signature module and its implementation; we now use
a Writer monad to accumulate errors; see the BootMismatch datatype
in GHC.Tc.Errors.Types, with its panoply of subtypes.
For the sake of readability, several local functions inside the
'checkBootTyCon' function were split off into top-level functions.
We split off GHC.Types.HscSource into a "boot or sig" vs "normal hs file"
datatype, as this mirrors the logic in several other places where we
want to treat hs-boot and hsig files in a similar fashion.
This commit also refactors the Backpack checks for type synonyms
implementing abstract data, to correctly reject implementations that
contain qualified or quantified types (this fixes #23342 and #23344).
Diffstat (limited to 'testsuite/tests/backpack/should_fail/bkpfail53.stderr')
| -rw-r--r-- | testsuite/tests/backpack/should_fail/bkpfail53.stderr | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/tests/backpack/should_fail/bkpfail53.stderr b/testsuite/tests/backpack/should_fail/bkpfail53.stderr index b694bc57ff..a5939ff072 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail53.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail53.stderr @@ -1,17 +1,17 @@ [1 of 2] Processing p - [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) - [2 of 2] Compiling I ( p/I.hs, nothing ) + [1 of 2] Compiling H[sig] ( p\H.hsig, nothing ) + [2 of 2] Compiling I ( p\I.hs, nothing ) [2 of 2] Processing q - [1 of 4] Compiling B ( q/B.hs, nothing ) - [2 of 4] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 4] Compiling B ( q\B.hs, nothing ) + [2 of 4] Compiling A[sig] ( q\A.hsig, nothing ) -bkpfail53.bkp:15:9: error: +bkpfail53.bkp:15:9: error: [GHC-15843] • Type constructor ‘T’ has conflicting definitions in the module - and its hsig file + and its hsig file. Main module: type T :: * type T = B.T - Hsig file: type T :: * - data T = T Int + Hsig file: type T :: * + data T = T Int • while merging the signatures from: • p[H=<A>]:H • ...and the local signature for A |