[commit: ghc] type-holes-branch: Merge remote branch 'laptop-HEAD/tc-untouchables' into type-holes-branch (646baf1)
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 : type-holes-branch http://hackage.haskell.org/trac/ghc/changeset/646baf1661e04e25a2d451a6b20353e6dd622720 >--------------------------------------------------------------- commit 646baf1661e04e25a2d451a6b20353e6dd622720 Merge: 2164e97... fe6ddf0... Author: Simon Peyton Jones <[email protected]> Date: Sat Sep 1 21:10:55 2012 +0100 Merge remote branch 'laptop-HEAD/tc-untouchables' into type-holes-branch Conflicts: compiler/typecheck/Inst.lhs compiler/typecheck/TcErrors.lhs compiler/typecheck/TcInteract.lhs compiler/typecheck/TcRnDriver.lhs compiler/typecheck/TcSMonad.lhs compiler/typecheck/TcSimplify.lhs compiler/basicTypes/VarEnv.lhs | 3 + compiler/typecheck/Inst.lhs | 51 +-- compiler/typecheck/TcBinds.lhs | 5 +- compiler/typecheck/TcCanonical.lhs | 349 +++++++------- compiler/typecheck/TcErrors.lhs | 94 ++--- compiler/typecheck/TcHsSyn.lhs | 21 +- compiler/typecheck/TcInteract.lhs | 563 ++++++++++------------ compiler/typecheck/TcMType.lhs | 76 ++- compiler/typecheck/TcRnDriver.lhs | 7 +- compiler/typecheck/TcRnMonad.lhs | 37 +- compiler/typecheck/TcRnTypes.lhs | 168 ++++---- compiler/typecheck/TcRules.lhs | 6 +- compiler/typecheck/TcSMonad.lhs | 933 +++++++++++++++++------------------- compiler/typecheck/TcSimplify.lhs | 625 +++++++++---------------- compiler/typecheck/TcType.lhs | 146 +++++-- compiler/typecheck/TcUnify.lhs | 36 +- compiler/types/Type.lhs | 2 +- compiler/utils/UniqFM.lhs | 5 +- 18 files changed, 1436 insertions(+), 1691 deletions(-) Diff suppressed because of size. To see it, use: git show 646baf1661e04e25a2d451a6b20353e6dd622720