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/tests/ghci.debugger | |
| 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/tests/ghci.debugger')
| -rw-r--r-- | testsuite/tests/ghci.debugger/scripts/break006.stderr | 8 | ||||
| -rw-r--r-- | testsuite/tests/ghci.debugger/scripts/print019.stderr | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr index 1b97299d92..198bc0df49 100644 --- a/testsuite/tests/ghci.debugger/scripts/break006.stderr +++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr @@ -8,8 +8,8 @@ instance Show Ordering -- Defined in ‘GHC.Show’ instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ instance Show Integer -- Defined in ‘GHC.Show’ - ...plus 23 others - ...plus 12 instances involving out-of-scope types + ...plus N others + ...plus N instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it @@ -22,7 +22,7 @@ instance Show Ordering -- Defined in ‘GHC.Show’ instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ instance Show Integer -- Defined in ‘GHC.Show’ - ...plus 23 others - ...plus 12 instances involving out-of-scope types + ...plus N others + ...plus N instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr index bac95541f4..09b1bfbd8c 100644 --- a/testsuite/tests/ghci.debugger/scripts/print019.stderr +++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr @@ -8,7 +8,7 @@ instance Show Ordering -- Defined in ‘GHC.Show’ instance Show TyCon -- Defined in ‘GHC.Show’ instance Show a => Show (List1 a) -- Defined at Test.hs:11:12 - ...plus 30 others - ...plus 13 instances involving out-of-scope types + ...plus N others + ...plus N instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it |