[commit: ghc] wip/rae-new-coercible: Sequelae from previous merge. (ad0e495)

[git at git.haskell.org]

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

On branch  : wip/rae-new-coercible
Link       : http://ghc.haskell.org/trac/ghc/changeset/ad0e495c32934ccd19fa515ef48cd3820205f084/ghc

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

commit ad0e495c32934ccd19fa515ef48cd3820205f084
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Dec 10 16:37:21 2014 -0500

    Sequelae from previous merge.


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

ad0e495c32934ccd19fa515ef48cd3820205f084
 compiler/typecheck/TcCanonical.hs |  55 ++++++++----
 compiler/typecheck/TcFlatten.hs   | 181 ++++++++++++++------------------------
 compiler/typecheck/TcInteract.hs  |   9 +-
 compiler/typecheck/TcSMonad.hs    |  14 ++-
 compiler/typecheck/TcType.hs      |   8 +-
 compiler/utils/MonadUtils.hs      |   6 +-
 6 files changed, 121 insertions(+), 152 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 ad0e495c32934ccd19fa515ef48cd3820205f084