[commit: ghc] wip/rae-new-coercible: Merge commit '4d5f83a' into wip/rae-new-coercible (c336539)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/rae-new-coercible
Link       : http://ghc.haskell.org/trac/ghc/changeset/c3365399437c16ccabe7818bba3d23891680c78d/ghc

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

commit c3365399437c16ccabe7818bba3d23891680c78d
Merge: fb10b82 4d5f83a
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sun Dec 7 14:47:25 2014 -0500

    Merge commit '4d5f83a' into wip/rae-new-coercible



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

c3365399437c16ccabe7818bba3d23891680c78d
 compiler/deSugar/{Check.lhs => Check.hs}           |  74 +++++++-------
 compiler/deSugar/{Coverage.lhs => Coverage.hs}     |  48 ++++-----
 compiler/deSugar/{Desugar.lhs => Desugar.hs}       |  75 +++++++--------
 compiler/deSugar/{DsArrows.lhs => DsArrows.hs}     |  74 ++++++--------
 compiler/deSugar/{DsBinds.lhs => DsBinds.hs}       |  62 ++++++------
 compiler/deSugar/{DsCCall.lhs => DsCCall.hs}       |  20 ++--
 compiler/deSugar/{DsExpr.lhs => DsExpr.hs}         |  93 ++++++++----------
 .../deSugar/{DsExpr.lhs-boot => DsExpr.hs-boot}    |   2 -
 compiler/deSugar/{DsForeign.lhs => DsForeign.hs}   |  83 ++++++++--------
 compiler/deSugar/{DsGRHSs.lhs => DsGRHSs.hs}       |  36 ++++---
 compiler/deSugar/{DsListComp.lhs => DsListComp.hs} |  73 ++++++--------
 compiler/deSugar/{DsMonad.lhs => DsMonad.hs}       |  63 +++++-------
 .../deSugar/{DsMonad.lhs-boot => DsMonad.hs-boot}  |   5 +-
 compiler/deSugar/{DsUtils.lhs => DsUtils.hs}       |  94 +++++++++---------
 compiler/deSugar/{Match.lhs => Match.hs}           | 107 ++++++++++-----------
 compiler/deSugar/{Match.lhs-boot => Match.hs-boot} |   2 -
 compiler/deSugar/{MatchCon.lhs => MatchCon.hs}     |  19 ++--
 compiler/deSugar/{MatchLit.lhs => MatchLit.hs}     |  93 +++++++++---------
 18 files changed, 453 insertions(+), 570 deletions(-)