diff options
| author | Richard Eisenberg <eir@cis.upenn.edu> | 2016-02-04 10:42:56 -0500 |
|---|---|---|
| committer | Richard Eisenberg <eir@cis.upenn.edu> | 2016-02-24 13:31:30 -0500 |
| commit | d8c64e86361f6766ebe26a262bb229fb8301a42a (patch) | |
| tree | 94d68ebcb1cc6e9eabff08d3cd1d7e61dd99c01e /testsuite/tests/polykinds | |
| parent | ce36115b369510c51f402073174d82d0d1244589 (diff) | |
| download | haskell-d8c64e86361f6766ebe26a262bb229fb8301a42a.tar.gz | |
Address #11471 by putting RuntimeRep in kinds.wip/runtime-rep
See Note [TYPE] in TysPrim. There are still some outstanding
pieces in #11471 though, so this doesn't actually nail the bug.
This commit also contains a few performance improvements:
* Short-cut equality checking of nullary type syns
* Compare types before kinds in eqType
* INLINE coreViewOneStarKind
* Store tycon binders separately from kinds.
This resulted in a ~10% performance improvement in compiling
the Cabal package. No change in functionality other than
performance. (This affects the interface file format, though.)
This commit updates the haddock submodule.
Diffstat (limited to 'testsuite/tests/polykinds')
| -rw-r--r-- | testsuite/tests/polykinds/T11399.stderr | 4 | ||||
| -rw-r--r-- | testsuite/tests/polykinds/T7328.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/polykinds/TidyClassKinds.stderr | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/polykinds/T11399.stderr b/testsuite/tests/polykinds/T11399.stderr index 31ccdf80b5..5e09870088 100644 --- a/testsuite/tests/polykinds/T11399.stderr +++ b/testsuite/tests/polykinds/T11399.stderr @@ -1,9 +1,9 @@ T11399.hs:7:32: error: - • Couldn't match kind ‘*’ with ‘GHC.Types.Levity’ + • Couldn't match kind ‘*’ with ‘GHC.Types.RuntimeRep’ When matching kinds k :: * -> * - TYPE :: GHC.Types.Levity -> * + TYPE :: GHC.Types.RuntimeRep -> * Expected kind ‘* -> *’, but ‘UhOh k’ has kind ‘k * -> *’ • In the first argument of ‘Functor’, namely ‘UhOh k’ In the instance declaration for ‘Functor (UhOh k)’ diff --git a/testsuite/tests/polykinds/T7328.stderr b/testsuite/tests/polykinds/T7328.stderr index 31b425f644..58e883e142 100644 --- a/testsuite/tests/polykinds/T7328.stderr +++ b/testsuite/tests/polykinds/T7328.stderr @@ -1,6 +1,6 @@ T7328.hs:8:34: error: - • Occurs check: cannot construct the infinite kind: k10 ~ k0 -> k10 + • Occurs check: cannot construct the infinite kind: k0 ~ k1 -> k0 • In the first argument of ‘Foo’, namely ‘f’ In the first argument of ‘Proxy’, namely ‘Foo f’ In the type signature: diff --git a/testsuite/tests/polykinds/TidyClassKinds.stderr b/testsuite/tests/polykinds/TidyClassKinds.stderr index 69ca49c188..5cbea8b417 100644 --- a/testsuite/tests/polykinds/TidyClassKinds.stderr +++ b/testsuite/tests/polykinds/TidyClassKinds.stderr @@ -1,7 +1,7 @@ TidyClassKinds.hs:12:10: error: • Illegal instance declaration for - ‘Poly (k1 -> *) (k1 -> *) (ProxySyn k1) (ProxySyn k1)’ + ‘Poly (k -> *) (k -> *) (ProxySyn k) (ProxySyn k)’ (All instance types must be of the form (T t1 ... tn) where T is not a synonym. Use TypeSynonymInstances if you want to disable this.) |