[commit: ghc] type-holes-branch: Merge remote branch 'laptop-HEAD/tc-untouchables' into type-holes-branch (5f44296)
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/5f44296897e946aac5ec3031126158144aa93f00 >--------------------------------------------------------------- commit 5f44296897e946aac5ec3031126158144aa93f00 Merge: 07c1041... cb72b66... Author: Simon Peyton Jones <[email protected]> Date: Sun Sep 9 08:45:33 2012 +0100 Merge remote branch 'laptop-HEAD/tc-untouchables' into type-holes-branch And a few more changes in TcErrors Conflicts: compiler/typecheck/TcErrors.lhs compiler/typecheck/TcMType.lhs compiler/typecheck/TcSimplify.lhs compiler/typecheck/TcErrors.lhs | 25 +++-- compiler/typecheck/TcInteract.lhs | 6 +- compiler/typecheck/TcMType.lhs | 101 +++++++++++++-- compiler/typecheck/TcRnMonad.lhs | 1 + compiler/typecheck/TcRnTypes.lhs | 12 ++- compiler/typecheck/TcSimplify.lhs | 252 ++++++++++++------------------------- compiler/typecheck/TcType.lhs | 111 +++++++++++++---- 7 files changed, 287 insertions(+), 221 deletions(-) Diff suppressed because of size. To see it, use: git show 5f44296897e946aac5ec3031126158144aa93f00