[commit: ghc] wip/T5462: Merge branch 'master' into wip/T5462 (7452b6a)

[git at git.haskell.org]

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

On branch  : wip/T5462
Link       : http://ghc.haskell.org/trac/ghc/changeset/7452b6a74ffd45930b3207c98a95205ec8171f85/ghc

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

commit 7452b6a74ffd45930b3207c98a95205ec8171f85
Merge: a7f1bb9 0a8e899
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Wed Nov 5 09:06:12 2014 +0000

    Merge branch 'master' into wip/T5462



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

7452b6a74ffd45930b3207c98a95205ec8171f85
 compiler/deSugar/DsMeta.hs                  |   2 +-
 compiler/hsSyn/HsExpr.lhs                   | 140 +++++++++++++++++-----------
 compiler/hsSyn/HsUtils.lhs                  |   8 +-
 compiler/rename/RnSplice.lhs                |  45 ++++-----
 compiler/typecheck/TcExpr.lhs               |   3 +-
 compiler/typecheck/TcHsSyn.lhs              |   4 +-
 compiler/typecheck/TcRnTypes.lhs            |   4 +-
 compiler/typecheck/TcSplice.lhs             |  16 ++--
 compiler/utils/UniqFM.lhs                   |  20 +---
 libraries/base/Data/Foldable.hs             |  14 +--
 testsuite/tests/ghci/scripts/ghci025.stdout |   3 +-
 testsuite/tests/perf/compiler/all.T         |   6 +-
 12 files changed, 145 insertions(+), 120 deletions(-)