[commit: ghc] type-holes-branch: Merge remote branch 'laptop-HEAD/tc-untouchables' into type-holes-branch (59e6bd9)
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/59e6bd9b2df224e23d87adc556791c9d2417dc6e >--------------------------------------------------------------- commit 59e6bd9b2df224e23d87adc556791c9d2417dc6e Merge: 646baf1... b04a2f9... Author: Simon Peyton Jones <[email protected]> Date: Mon Sep 3 21:20:28 2012 +0100 Merge remote branch 'laptop-HEAD/tc-untouchables' into type-holes-branch Plus more refactoring for holes Conflicts: compiler/typecheck/TcSimplify.lhs compiler/typecheck/TcCanonical.lhs | 9 +- compiler/typecheck/TcErrors.lhs | 140 ++++++++++----- compiler/typecheck/TcExpr.lhs | 2 +- compiler/typecheck/TcInteract.lhs | 7 +- compiler/typecheck/TcMType.lhs | 8 +- compiler/typecheck/TcRnTypes.lhs | 14 +- compiler/typecheck/TcSMonad.lhs | 89 +++++----- compiler/typecheck/TcSimplify.lhs | 347 +++++++++++++++--------------------- compiler/typecheck/TcType.lhs | 13 -- compiler/typecheck/TcUnify.lhs | 6 +- compiler/types/Type.lhs | 18 ++- 11 files changed, 326 insertions(+), 327 deletions(-) Diff suppressed because of size. To see it, use: git show 59e6bd9b2df224e23d87adc556791c9d2417dc6e