[commit: ghc] ghc-8.2: Revert "Improve error messages around kind mismatches." (00c959e)

git at git.haskell.org git at git.haskell.org
Tue Sep 19 21:54:26 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/00c959e64370bac44591e433ef3cef7fda3ba78b/ghc

>---------------------------------------------------------------

commit 00c959e64370bac44591e433ef3cef7fda3ba78b
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Sep 19 17:14:25 2017 -0400

    Revert "Improve error messages around kind mismatches."
    
    This reverts commit eb870ae0e9d3943268263e6f9ef1c844cdd4cdc5.
    This reverts commit 6a024a55fa5deefaa45bc2abee9efa63d290266d.
    
    There was some disagreement in #11198 regarding whether this patch was
    in fact the right solution to the issue at hand.


>---------------------------------------------------------------

00c959e64370bac44591e433ef3cef7fda3ba78b
 compiler/typecheck/TcCanonical.hs                  | 296 +++++++++------------
 compiler/typecheck/TcErrors.hs                     |  79 ++----
 compiler/typecheck/TcEvidence.hs                   |   8 +-
 compiler/typecheck/TcFlatten.hs                    |  31 +--
 compiler/typecheck/TcRnTypes.hs                    |  30 +--
 compiler/typecheck/TcSimplify.hs                   |  34 +--
 compiler/typecheck/TcType.hs                       |  10 +-
 compiler/typecheck/TcUnify.hs                      |  28 +-
 compiler/types/Type.hs                             |   4 +-
 testsuite/tests/dependent/should_fail/T11471.hs    |   2 +-
 .../tests/dependent/should_fail/T11471.stderr      |  13 +-
 testsuite/tests/dependent/should_fail/all.T        |   2 +-
 testsuite/tests/deriving/should_fail/T7148.stderr  |   8 +-
 testsuite/tests/gadt/T7558.stderr                  |   6 +-
 testsuite/tests/gadt/gadt7.stderr                  |   6 +-
 .../tests/ghci.debugger/scripts/break012.stdout    |  14 +-
 .../tests/indexed-types/should_fail/T5934.stderr   |  13 +
 testsuite/tests/polykinds/T11399.stderr            |   6 +-
 testsuite/tests/polykinds/T13555.stderr            |  21 +-
 testsuite/tests/polykinds/T7438.stderr             |   6 +-
 testsuite/tests/polykinds/T8566.stderr             |   2 +-
 testsuite/tests/polykinds/T9017.stderr             |  10 +-
 .../tests/typecheck/should_compile/FD3.stderr      |   6 +-
 .../tests/typecheck/should_compile/T9834.stderr    |   4 +-
 .../tests/typecheck/should_fail/T11672.stderr      |   2 +-
 testsuite/tests/typecheck/should_fail/T12373.hs    |  10 -
 .../tests/typecheck/should_fail/T12373.stderr      |   8 -
 .../tests/typecheck/should_fail/T12785b.stderr     |   6 -
 testsuite/tests/typecheck/should_fail/T13530.hs    |  11 -
 .../tests/typecheck/should_fail/T13530.stderr      |   7 -
 testsuite/tests/typecheck/should_fail/T13610.hs    |  11 -
 .../tests/typecheck/should_fail/T13610.stderr      |  10 -
 testsuite/tests/typecheck/should_fail/T3950.stderr |   5 +-
 testsuite/tests/typecheck/should_fail/T5691.stderr |  10 +-
 testsuite/tests/typecheck/should_fail/T7368.stderr |   6 +-
 .../tests/typecheck/should_fail/T7368a.stderr      |   2 +-
 testsuite/tests/typecheck/should_fail/T7453.stderr |  48 +++-
 testsuite/tests/typecheck/should_fail/T7696.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T8262.stderr |   6 +-
 testsuite/tests/typecheck/should_fail/T8603.hs     |   4 -
 testsuite/tests/typecheck/should_fail/T8603.stderr |  13 +-
 testsuite/tests/typecheck/should_fail/all.T        |   3 -
 testsuite/tests/typecheck/should_fail/mc19.stderr  |   6 +-
 testsuite/tests/typecheck/should_fail/mc21.stderr  |   6 +-
 testsuite/tests/typecheck/should_fail/mc22.stderr  |   6 +-
 .../tests/typecheck/should_fail/tcfail090.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail122.stderr   |   6 +-
 .../tests/typecheck/should_fail/tcfail123.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail191.stderr   |   6 +-
 .../tests/typecheck/should_fail/tcfail193.stderr   |   6 +-
 .../tests/typecheck/should_fail/tcfail200.stderr   |   6 +-
 testsuite/tests/typecheck/should_run/T7861.stderr  |   6 +-
 52 files changed, 378 insertions(+), 483 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 00c959e64370bac44591e433ef3cef7fda3ba78b


More information about the ghc-commits mailing list