[commit: ghc] master: Revert multiple commits (3cf8ecd)
git at git.haskell.org
git at git.haskell.org
Thu May 14 21:26:05 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4/ghc
>---------------------------------------------------------------
commit 3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4
Author: Austin Seipp <austin at well-typed.com>
Date: Thu May 14 10:55:03 2015 -0500
Revert multiple commits
This reverts multiple commits from Simon:
- 04a484eafc9eb9f8774b4bdd41a5dc6c9f640daf Test Trac #10359
- a9ccd37add8315e061c02e5bf26c08f05fad9ac9 Test Trac #10403
- c0aae6f699cbd222d826d0b8d78d6cb3f682079e Test Trac #10248
- eb6ca851f553262efe0824b8dcbe64952de4963d Make the "matchable-given" check happen first
- ca173aa30467a0b1023682d573fcd94244d85c50 Add a case to checkValidTyCon
- 51cbad15f86fca1d1b0e777199eb1079a1b64d74 Update haddock submodule
- 6e1174da5b8e0b296f5bfc8b39904300d04eb5b7 Separate transCloVarSet from fixVarSet
- a8493e03b89f3b3bfcdb6005795de050501f5c29 Fix imports in HscMain (stage2)
- a154944bf07b2e13175519bafebd5a03926bf105 Two wibbles to fix the build
- 5910a1bc8142b4e56a19abea104263d7bb5c5d3f Change in capitalisation of error msg
- 130e93aab220bdf14d08028771f83df210da340b Refactor tuple constraints
- 8da785d59f5989b9a9df06386d5bd13f65435bc0 Delete commented-out line
These break the build by causing Haddock to fail mysteriously when
trying to examine GHC.Prim it seems.
>---------------------------------------------------------------
3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4
compiler/basicTypes/BasicTypes.hs | 21 +-
compiler/basicTypes/DataCon.hs | 1 +
compiler/basicTypes/RdrName.hs | 28 +-
compiler/basicTypes/Unique.hs | 28 +-
compiler/basicTypes/VarSet.hs | 23 +-
compiler/coreSyn/CoreLint.hs | 2 +-
compiler/coreSyn/MkCore.hs | 7 +-
compiler/coreSyn/PprCore.hs | 4 +-
compiler/deSugar/Check.hs | 2 +-
compiler/deSugar/DsArrows.hs | 2 +-
compiler/deSugar/DsBinds.hs | 25 +-
compiler/deSugar/DsCCall.hs | 6 +-
compiler/deSugar/DsExpr.hs | 5 +-
compiler/deSugar/DsMeta.hs | 840 ++++++++++++++++++++-
compiler/deSugar/Match.hs | 4 +-
compiler/ghc.cabal.in | 3 +-
compiler/ghci/RtClosureInspect.hs | 7 +-
compiler/hsSyn/Convert.hs | 4 +-
compiler/hsSyn/HsExpr.hs | 3 +-
compiler/hsSyn/HsPat.hs | 35 +-
compiler/hsSyn/HsTypes.hs | 2 +-
compiler/iface/BinIface.hs | 14 +-
compiler/iface/BuildTyCl.hs | 4 -
compiler/iface/IfaceSyn.hs | 9 +-
compiler/iface/IfaceType.hs | 154 ++--
compiler/iface/TcIface.hs | 84 +--
compiler/main/Constants.hs | 3 -
compiler/main/HscMain.hs | 11 +-
compiler/main/StaticFlags.hs | 1 +
compiler/parser/Parser.y | 20 +-
compiler/parser/RdrHsSyn.hs | 164 +---
compiler/prelude/PrelInfo.hs | 28 +-
compiler/prelude/PrelNames.hs | 17 +
compiler/prelude/PrelRules.hs | 6 +-
compiler/prelude/PrimOp.hs | 2 +-
compiler/prelude/THNames.hs | 836 --------------------
compiler/prelude/TysWiredIn.hs | 269 +++----
compiler/rename/RnEnv.hs | 1 -
compiler/rename/RnNames.hs | 42 +-
compiler/rename/RnSplice.hs | 6 +-
compiler/simplStg/UnariseStg.hs | 10 +-
compiler/specialise/Specialise.hs | 3 +-
compiler/stranal/WwLib.hs | 6 +-
compiler/typecheck/FunDeps.hs | 32 +-
compiler/typecheck/TcCanonical.hs | 32 +
compiler/typecheck/TcErrors.hs | 2 +
compiler/typecheck/TcEvidence.hs | 15 +-
compiler/typecheck/TcExpr.hs | 10 +-
compiler/typecheck/TcGenDeriv.hs | 15 +-
compiler/typecheck/TcHsSyn.hs | 5 +-
compiler/typecheck/TcHsType.hs | 15 +-
compiler/typecheck/TcInstDcls.hs | 4 +-
compiler/typecheck/TcInteract.hs | 122 ++-
compiler/typecheck/TcMType.hs | 1 +
compiler/typecheck/TcPat.hs | 2 +-
compiler/typecheck/TcRnMonad.hs | 4 -
compiler/typecheck/TcSimplify.hs | 1 +
compiler/typecheck/TcSplice.hs | 2 +-
compiler/typecheck/TcTyClsDecls.hs | 20 +-
compiler/typecheck/TcType.hs | 3 +
compiler/typecheck/TcValidity.hs | 186 ++---
compiler/types/TyCon.hs | 34 +-
compiler/types/Type.hs | 7 +-
compiler/types/TypeRep.hs | 11 +-
compiler/vectorise/Vectorise/Builtins/Base.hs | 2 +-
.../vectorise/Vectorise/Builtins/Initialise.hs | 2 +-
compiler/vectorise/Vectorise/Utils/Closure.hs | 4 +-
libraries/ghc-prim/GHC/Classes.hs | 44 +-
libraries/ghc-prim/GHC/Tuple.hs | 242 +++---
libraries/ghc-prim/GHC/Types.hs | 2 +-
testsuite/tests/ghci/scripts/T10248.script | 2 -
testsuite/tests/ghci/scripts/T10248.stderr | 18 -
testsuite/tests/ghci/scripts/all.T | 1 -
.../should_fail/NotRelaxedExamples.stderr | 17 +-
.../indexed-types/should_fail/TyFamUndec.stderr | 17 +-
testsuite/tests/module/all.T | 2 +-
testsuite/tests/module/mod89.hs | 2 -
testsuite/tests/module/mod89.stderr | 10 +-
.../tests/partial-sigs/should_compile/T10403.hs | 19 -
.../partial-sigs/should_compile/T10403.stderr | 17 -
testsuite/tests/partial-sigs/should_compile/all.T | 1 -
testsuite/tests/perf/should_run/T10359.hs | 125 ---
testsuite/tests/perf/should_run/T10359.stdout | 1 -
testsuite/tests/perf/should_run/all.T | 10 +-
.../tests/rts/outofmem.stderr-i386-unknown-mingw32 | 2 +-
.../tests/typecheck/should_fail/T9858a.stderr | 2 +-
.../tests/typecheck/should_fail/fd-loop.stderr | 12 +-
.../tests/typecheck/should_fail/tcfail108.stderr | 4 +-
.../tests/typecheck/should_fail/tcfail154.stderr | 6 +-
.../tests/typecheck/should_fail/tcfail157.stderr | 12 +-
.../tests/typecheck/should_fail/tcfail213.stderr | 4 +-
.../tests/typecheck/should_fail/tcfail214.stderr | 8 +-
.../tests/typecheck/should_fail/tcfail220.hsig | 1 +
.../tests/typecheck/should_fail/tcfail220.stderr | 8 +
utils/genprimopcode/Main.hs | 2 +-
utils/haddock | 2 +-
96 files changed, 1702 insertions(+), 2164 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4
More information about the ghc-commits
mailing list