diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2018-12-07 14:25:30 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2018-12-07 14:44:26 +0000 |
| commit | 5b7ca03995c1d5fbd29ba0e327bb2a1f344c9419 (patch) | |
| tree | 24d1d51df1ea68c0216d532cf3edac4639dcfcb7 /testsuite/tests/typecheck/should_compile | |
| parent | eee1b61f85d949aa7c4bc496b5579cf759d1861e (diff) | |
| download | haskell-5b7ca03995c1d5fbd29ba0e327bb2a1f344c9419.tar.gz | |
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.
Diffstat (limited to 'testsuite/tests/typecheck/should_compile')
| -rw-r--r-- | testsuite/tests/typecheck/should_compile/T12763.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/typecheck/should_compile/tc231.stderr | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/typecheck/should_compile/T12763.stderr b/testsuite/tests/typecheck/should_compile/T12763.stderr index 99a66bd59e..eff7c0a28f 100644 --- a/testsuite/tests/typecheck/should_compile/T12763.stderr +++ b/testsuite/tests/typecheck/should_compile/T12763.stderr @@ -2,7 +2,7 @@ TYPE SIGNATURES f :: Int -> () m :: forall a. C a => a -> () TYPE CONSTRUCTORS - C{1} :: * -> Constraint + class C{1} :: * -> Constraint COERCION AXIOMS axiom T12763.N:C :: C a = a -> () CLASS INSTANCES diff --git a/testsuite/tests/typecheck/should_compile/tc231.stderr b/testsuite/tests/typecheck/should_compile/tc231.stderr index 18beabd3a1..8340d3f033 100644 --- a/testsuite/tests/typecheck/should_compile/tc231.stderr +++ b/testsuite/tests/typecheck/should_compile/tc231.stderr @@ -6,9 +6,9 @@ TYPE SIGNATURES huh :: forall s a b chain. Zork s a b => Q s a chain -> ST s () s :: forall t t1. Q t (Z [Char]) t1 -> Q t (Z [Char]) t1 TYPE CONSTRUCTORS - Q{3} :: * -> * -> * -> * - Z{1} :: * -> * - Zork{3} :: * -> * -> * -> Constraint + data type Q{3} :: * -> * -> * -> * + data type Z{1} :: * -> * + class Zork{3} :: * -> * -> * -> Constraint COERCION AXIOMS axiom N:Zork :: Zork s a b = forall chain. Q s a chain -> ST s () DATA CONSTRUCTORS |