[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (0f3d8ab)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0f3d8ab9f8c174f9aba5764a6b1edaf2c873b8c6

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

commit 0f3d8ab9f8c174f9aba5764a6b1edaf2c873b8c6
Merge: 82a8ffd... 1e9a2d3...
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Jun 14 12:46:48 2012 +0100

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

 compiler/basicTypes/BasicTypes.lhs |   28 ---------
 compiler/basicTypes/Unique.lhs     |    3 -
 compiler/coreSyn/MkCore.lhs        |   23 +-------
 compiler/deSugar/DsExpr.lhs        |    6 +-
 compiler/ghc.cabal.in              |    1 -
 compiler/hsSyn/HsBinds.lhs         |   13 +++-
 compiler/hsSyn/HsExpr.lhs          |    2 +-
 compiler/hsSyn/HsTypes.lhs         |   21 ++++++-
 compiler/iface/BinIface.hs         |   20 +------
 compiler/iface/IfaceEnv.lhs        |   24 +-------
 compiler/iface/IfaceType.lhs       |   19 +------
 compiler/iface/TcIface.lhs         |    2 -
 compiler/main/DynFlags.hs          |    5 ++
 compiler/main/HscTypes.lhs         |   10 +---
 compiler/parser/Parser.y.pp        |    6 +-
 compiler/prelude/PrelNames.lhs     |   15 +++++-
 compiler/prelude/TysWiredIn.lhs    |   41 +-------------
 compiler/rename/RnBinds.lhs        |    7 +-
 compiler/rename/RnExpr.lhs         |    3 +-
 compiler/rename/RnTypes.lhs        |   11 +---
 compiler/typecheck/Inst.lhs        |    2 -
 compiler/typecheck/TcBinds.lhs     |   27 +++++++--
 compiler/typecheck/TcCanonical.lhs |   46 ---------------
 compiler/typecheck/TcErrors.lhs    |    6 +-
 compiler/typecheck/TcExpr.lhs      |   27 ++++++---
 compiler/typecheck/TcHsSyn.lhs     |   11 ++--
 compiler/typecheck/TcHsType.lhs    |    6 ++-
 compiler/typecheck/TcInteract.lhs  |  112 ++++++++++++++++++++----------------
 compiler/typecheck/TcMType.lhs     |   42 ++++---------
 compiler/typecheck/TcRnTypes.lhs   |   23 +------
 compiler/typecheck/TcSMonad.lhs    |   25 ++------
 compiler/typecheck/TcSimplify.lhs  |   65 ++++++++++++++++++++-
 compiler/typecheck/TcSplice.lhs    |    8 ++-
 compiler/typecheck/TcType.lhs      |    5 +-
 compiler/types/IParam.lhs          |   41 -------------
 compiler/types/IParam.lhs-boot     |   10 ---
 compiler/types/TyCon.lhs           |   15 +-----
 compiler/types/Type.lhs            |   42 +++++---------
 compiler/types/TypeRep.lhs         |   12 ++--
 39 files changed, 307 insertions(+), 478 deletions(-)