[commit: ghc] no-pred-ty: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc into no-pred-ty (34ca35d)

[Max Bolingbroke]

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

On branch  : no-pred-ty

http://hackage.haskell.org/trac/ghc/changeset/34ca35d91a6766c219f246bedfcd88bdf4c3a1d9

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

commit 34ca35d91a6766c219f246bedfcd88bdf4c3a1d9
Merge: a73d479... de9b85f...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Sun Sep 4 12:59:31 2011 +0100

    Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc into no-pred-ty
    
    Conflicts:
    	compiler/iface/BuildTyCl.lhs
    	compiler/rename/RnSource.lhs
    	compiler/types/TyCon.lhs

 compiler/basicTypes/Name.lhs        |   38 ++-
 compiler/basicTypes/RdrName.lhs     |    6 +-
 compiler/basicTypes/SrcLoc.lhs      |    7 -
 compiler/hsSyn/Convert.lhs          |   26 +-
 compiler/hsSyn/HsBinds.lhs          |   52 +++-
 compiler/hsSyn/HsDecls.lhs          |   36 ++-
 compiler/hsSyn/HsTypes.lhs          |    5 +-
 compiler/iface/BinIface.hs          |    4 +-
 compiler/iface/BuildTyCl.lhs        |    7 +-
 compiler/iface/IfaceSyn.lhs         |   24 +-
 compiler/iface/MkIface.lhs          |    2 +-
 compiler/iface/TcIface.lhs          |    2 +-
 compiler/main/DynFlags.hs           |    3 +
 compiler/main/GHC.hs                |    2 +-
 compiler/main/PprTyThing.hs         |    5 +-
 compiler/parser/Parser.y.pp         |    6 -
 compiler/parser/RdrHsSyn.lhs        |   31 +-
 compiler/rename/RnBinds.lhs         |   70 ++---
 compiler/rename/RnEnv.lhs           |   11 +-
 compiler/rename/RnNames.lhs         |   80 +++--
 compiler/rename/RnSource.lhs        |  206 ++++++-------
 compiler/typecheck/TcBinds.lhs      |   20 +-
 compiler/typecheck/TcClassDcl.lhs   |   10 +-
 compiler/typecheck/TcDeriv.lhs      |    2 +-
 compiler/typecheck/TcInstDcls.lhs   |  345 +++++++++-----------
 compiler/typecheck/TcRnDriver.lhs   |    4 +-
 compiler/typecheck/TcRnTypes.lhs    |   36 ++-
 compiler/typecheck/TcSplice.lhs     |    3 +-
 compiler/typecheck/TcTyClsDecls.lhs |   38 +--
 compiler/types/FamInstEnv.lhs       |    2 +-
 compiler/types/FunDeps.lhs          |    4 +-
 compiler/types/InstEnv.lhs          |    2 +-
 compiler/types/TyCon.lhs            |  104 +++++--
 compiler/types/Unify.lhs            |   10 +-
 docs/users_guide/flags.xml          |    6 +
 docs/users_guide/glasgow_exts.xml   |  604 ++++++++++++++++++-----------------
 ghc/InteractiveUI.hs                |    7 +-
 includes/HaskellConstants.hs        |    4 +-
 rts/Exception.cmm                   |   16 +-
 39 files changed, 982 insertions(+), 858 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 34ca35d91a6766c219f246bedfcd88bdf4c3a1d9