[commit: ghc] master: Show explicit quantifiers in conflicting definitions error (33140f4)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/33140f41b931fb81bf2e5aa28603fe757bb3779d/ghc

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

commit 33140f41b931fb81bf2e5aa28603fe757bb3779d
Author: Phil de Joux <phil.dejoux at blockscope.com>
Date:   Fri Jan 20 14:59:44 2017 -0500

    Show explicit quantifiers in conflicting definitions error
    
    This fixes #12441, where definitions in a Haskell module and its boot
    file which differed only in their quantifiers produced a confusing error
    message. Here we teach GHC to always show quantifiers for these errors.
    
    Reviewers: goldfire, simonmar, erikd, austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: snowleopard, simonpj, mpickering, thomie
    
    Differential Revision: https://phabricator.haskell.org/D2734
    
    GHC Trac Issues: #12441


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

33140f41b931fb81bf2e5aa28603fe757bb3779d
 compiler/ghci/Debugger.hs                          |   3 +-
 compiler/iface/IfaceSyn.hs                         | 146 +++++++++++++--------
 compiler/iface/IfaceType.hs                        |  42 +++---
 compiler/iface/IfaceType.hs-boot                   |   3 +-
 compiler/main/HscTypes.hs                          |   2 +-
 compiler/main/PprTyThing.hs                        |  69 +++++-----
 compiler/typecheck/TcRnDriver.hs                   |  45 +++++--
 compiler/types/TyCoRep.hs                          |   2 +-
 ghc/GHCi/UI.hs                                     |   9 +-
 testsuite/tests/codeGen/should_run/T12855.hs       |   1 -
 testsuite/tests/ghci/scripts/T11051b.stdout        |   2 +-
 testsuite/tests/ghci/scripts/ghci025.stdout        |  52 +++-----
 .../tests/partial-sigs/should_compile/T12844.hs    |   1 -
 testsuite/tests/typecheck/T12441/T12441.hs         |   5 +
 testsuite/tests/typecheck/T12441/T12441.hs-boot    |   3 +
 testsuite/tests/typecheck/T12441/T12441.stderr     |  10 ++
 testsuite/tests/typecheck/T12441/T12441A.hs        |   2 +
 testsuite/tests/typecheck/T12441/all.T             |   4 +
 .../tests/typecheck/should_compile/Improvement.hs  |   2 -
 19 files changed, 235 insertions(+), 168 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 33140f41b931fb81bf2e5aa28603fe757bb3779d