diff options
| author | sheaf <sam.derbyshire@gmail.com> | 2021-10-05 18:16:27 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-06 10:58:03 -0400 |
| commit | a466b02492f73a43c6cb9ce69491fc85234b9559 (patch) | |
| tree | 6d4f7c1d0ad4609fa1878d44f0e1e20b8c4501ef /testsuite/driver | |
| parent | 9af29e7fa81a8696a2d829a0ecbebcbc8be5badd (diff) | |
| download | haskell-a466b02492f73a43c6cb9ce69491fc85234b9559.tar.gz | |
Improve overlap error for polykinded constraints
There were two problems around `mkDictErr`:
1. An outdated call to `flattenTys` meant that we missed out on some
instances. As we no longer flatten type-family applications,
the logic is obsolete and can be removed.
2. We reported "out of scope" errors in a poly-kinded situation
because `BoxedRep` and `Lifted` were considered out of scope.
We fix this by using `pretendNameIsInScope`.
fixes #20465
Diffstat (limited to 'testsuite/driver')
| -rw-r--r-- | testsuite/driver/testlib.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index fba69533e0..7a1fafbbd7 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -2232,9 +2232,11 @@ def normalise_errmsg(s: str) -> str: # Error messages sometimes contain ghc-bignum implementation package s = re.sub('ghc-bignum-[0-9.]+', 'ghc-bignum-<VERSION>', s) - # Error messages sometimes contain this blurb which can vary + # Error messages sometimes contain these blurbs which can vary # spuriously depending upon build configuration (e.g. based on bignum # backend) + s = re.sub('...plus ([a-z]+|[0-9]+) others', + '...plus N others', s) s = re.sub('...plus ([a-z]+|[0-9]+) instances involving out-of-scope types', '...plus N instances involving out-of-scope types', s) |