[commit: ghc] master: Merge branch 'tc-untouchables' of http://darcs.haskell.org/ghc into tc-untouchables (fd3bd41)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/fd3bd41705b52b17f1cf2f46d8a5b356a6ca592f >--------------------------------------------------------------- commit fd3bd41705b52b17f1cf2f46d8a5b356a6ca592f Merge: 316d3ed... b3f2f73... Author: Simon Peyton Jones <[email protected]> Date: Mon Oct 1 11:26:12 2012 +0100 Merge branch 'tc-untouchables' of http://darcs.haskell.org/ghc into tc-untouchables compiler/typecheck/FamInst.lhs | 4 ++- compiler/typecheck/TcCanonical.lhs | 55 ++++++++++++------------------ compiler/typecheck/TcInteract.lhs | 64 ++++++++++++++++-------------------- compiler/typecheck/TcMType.lhs | 8 ++-- compiler/typecheck/TcRnMonad.lhs | 5 +++ compiler/typecheck/TcSMonad.lhs | 45 ++++++++++++++----------- compiler/typecheck/TcUnify.lhs | 27 ++++++++------- compiler/types/Coercion.lhs | 13 +++++-- 8 files changed, 112 insertions(+), 109 deletions(-)