[commit: ghc] master: Remove some horrible munging of origins for Coercible (02bac02)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/02bac0254182def11029e2f7373ba8d2ba9ebe44/ghc

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

commit 02bac0254182def11029e2f7373ba8d2ba9ebe44
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jun 18 14:12:54 2015 +0100

    Remove some horrible munging of origins for Coercible
    
    I just didn't think it was buying enough for all the cruft it caused.
    We can put some back if people start complaining about poor error
    messages. I forget quite how I tripped over this but I got sucked in.
    
    * Lots of tidying up in TcErrors
    
    * Rename pprArisingAt to pprCtLoc, by analogy with pprCtOrigin
    
    * Remove CoercibleOrigin data constructor from CtOrigin
    
    * Make relevantBindings return a Ct with a zonked
      and tidied CtOrigin
    
    * Add to TcRnTypes
          ctOrigin   :: Ct -> CtOrigin
          ctEvOrigin :: CtEvidence -> CtOrigin
          setCtLoc   :: Ct -> CtLoc -> Ct


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

02bac0254182def11029e2f7373ba8d2ba9ebe44
 compiler/typecheck/Inst.hs                         |  17 +-
 compiler/typecheck/TcErrors.hs                     | 228 +++++++++++----------
 compiler/typecheck/TcMType.hs                      |   4 -
 compiler/typecheck/TcRnTypes.hs                    |  49 +++--
 testsuite/tests/deriving/should_fail/T4846.stderr  |   7 +-
 testsuite/tests/deriving/should_fail/T5498.stderr  |   9 +-
 testsuite/tests/deriving/should_fail/T6147.stderr  |   7 +-
 testsuite/tests/deriving/should_fail/T7148.stderr  |  22 +-
 testsuite/tests/deriving/should_fail/T7148a.stderr |  18 +-
 testsuite/tests/deriving/should_fail/T8851.stderr  |  21 +-
 testsuite/tests/deriving/should_fail/T8984.stderr  |   8 +-
 testsuite/tests/gadt/CasePrune.stderr              |   7 +-
 testsuite/tests/ghci/scripts/Defer02.stderr        |  64 +++---
 testsuite/tests/ghci/scripts/T8649.stderr          |   6 +-
 testsuite/tests/ghci/scripts/ghci050.stderr        |   6 +-
 testsuite/tests/ghci/scripts/ghci051.stderr        |   6 +-
 testsuite/tests/ghci/scripts/ghci052.stderr        |  24 +--
 testsuite/tests/ghci/scripts/ghci053.stderr        |  12 +-
 .../tests/indexed-types/should_fail/T6088.stderr   |   3 +-
 .../tests/indexed-types/should_fail/T9580.stderr   |   4 +-
 testsuite/tests/module/mod180.stderr               |   6 +-
 testsuite/tests/polykinds/T7438.stderr             |  10 +-
 testsuite/tests/roles/should_fail/Roles10.stderr   |   7 +-
 .../tests/roles/should_fail/RolesIArray.stderr     | 114 ++++-------
 testsuite/tests/typecheck/bug1465/bug1465.stderr   |   6 +-
 .../tests/typecheck/should_compile/FD3.stderr      |  11 +-
 .../tests/typecheck/should_fail/T10285.stderr      |   5 +-
 .../tests/typecheck/should_fail/T10495.stderr      |   1 +
 .../tests/typecheck/should_fail/T10534.stderr      |   5 +-
 testsuite/tests/typecheck/should_fail/T5853.stderr |   2 +-
 .../typecheck/should_fail/TcCoercibleFail.stderr   |  20 +-
 .../typecheck/should_fail/TcCoercibleFail3.stderr  |  10 +-
 .../tests/typecheck/should_fail/tcfail182.stderr   |   7 +-
 33 files changed, 332 insertions(+), 394 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 02bac0254182def11029e2f7373ba8d2ba9ebe44