[commit: ghc] master: Wibble to Taming the Kind Inference Monster (5b7ca03)
git at git.haskell.org
git at git.haskell.org
Fri Dec 7 14:44:47 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/5b7ca03995c1d5fbd29ba0e327bb2a1f344c9419/ghc
>---------------------------------------------------------------
commit 5b7ca03995c1d5fbd29ba0e327bb2a1f344c9419
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Dec 7 14:25:30 2018 +0000
Wibble to Taming the Kind Inference Monster
I had allowed rename/should_fail/T15828 (Trac #15828) to regress a bit.
The main payload of this patch is to fix that problem, at the cost of
more contortions in checkConsistentFamInst. Oh well, at least they are
highly localised.
I also update the -ddump-types code in TcRnDriver to print out some
more expicit information about each type constructor, thus instead of
DF{3} :: forall k. * -> k -> *
we get
data family DF{3} :: forall k. * -> k -> *
Remember, this is debug-printing only. This change is the reason
that so many .stderr files change.
>---------------------------------------------------------------
5b7ca03995c1d5fbd29ba0e327bb2a1f344c9419
compiler/typecheck/ClsInst.hs | 2 +
compiler/typecheck/TcInstDcls.hs | 2 +-
compiler/typecheck/TcRnDriver.hs | 14 ++--
compiler/typecheck/TcValidity.hs | 86 +++++++++++++++++-----
compiler/types/Coercion.hs | 14 ++--
compiler/types/FamInstEnv.hs | 2 +-
.../tests/dependent/should_compile/T15743.stderr | 5 +-
.../tests/dependent/should_compile/T15743e.stderr | 36 +++++++--
.../indexed-types/should_compile/T15711.stderr | 6 +-
.../indexed-types/should_compile/T15852.stderr | 7 +-
.../indexed-types/should_compile/T3017.stderr | 8 +-
.../should_fail/ExplicitForAllFams4b.stderr | 8 +-
.../indexed-types/should_fail/SimpleFail2a.stderr | 2 +-
.../indexed-types/should_fail/SimpleFail9.stderr | 2 +-
.../tests/indexed-types/should_fail/T11450.stderr | 2 +-
.../tests/indexed-types/should_fail/T12041.stderr | 2 +-
.../tests/indexed-types/should_fail/T14230.stderr | 2 +-
.../tests/indexed-types/should_fail/T9160.stderr | 2 +-
.../tests/partial-sigs/should_compile/ADT.stderr | 2 +-
.../should_compile/DataFamilyInstanceLHS.stderr | 9 +--
.../partial-sigs/should_compile/Meltdown.stderr | 4 +-
.../NamedWildcardInDataFamilyInstanceLHS.stderr | 9 +--
.../NamedWildcardInTypeFamilyInstanceLHS.stderr | 4 +-
.../partial-sigs/should_compile/SkipMany.stderr | 2 +-
.../should_compile/TypeFamilyInstanceLHS.stderr | 4 +-
testsuite/tests/polykinds/T14450.stderr | 2 +-
testsuite/tests/polykinds/T15592.stderr | 4 +-
testsuite/tests/polykinds/T15592b.stderr | 7 +-
testsuite/tests/rename/should_fail/T15828.stderr | 2 +-
testsuite/tests/roles/should_compile/Roles1.stderr | 24 +++---
.../tests/roles/should_compile/Roles14.stderr | 4 +-
testsuite/tests/roles/should_compile/Roles2.stderr | 6 +-
testsuite/tests/roles/should_compile/Roles3.stderr | 22 +++---
testsuite/tests/roles/should_compile/Roles4.stderr | 6 +-
testsuite/tests/roles/should_compile/T8958.stderr | 10 +--
testsuite/tests/th/TH_Roles2.stderr | 4 +-
.../tests/typecheck/should_compile/T12763.stderr | 2 +-
.../tests/typecheck/should_compile/tc231.stderr | 6 +-
38 files changed, 205 insertions(+), 130 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5b7ca03995c1d5fbd29ba0e327bb2a1f344c9419
More information about the ghc-commits
mailing list