[commit: ghc] wip/orf-reboot: Revert "First stage of storing usage imports as GREs" (9531e9e)
git at git.haskell.org
git at git.haskell.org
Mon Oct 12 06:37:05 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/orf-reboot
Link : http://ghc.haskell.org/trac/ghc/changeset/9531e9e17fe762e06104bfa6202ea4f8e6970c0b/ghc
>---------------------------------------------------------------
commit 9531e9e17fe762e06104bfa6202ea4f8e6970c0b
Author: Adam Gundry <adam at well-typed.com>
Date: Tue Oct 6 14:38:20 2015 +0100
Revert "First stage of storing usage imports as GREs"
This reverts commit 860e549ac228b9ea49b93ea98c5257afeb5b1eb6.
Conflicts:
compiler/rename/RnNames.hs
>---------------------------------------------------------------
9531e9e17fe762e06104bfa6202ea4f8e6970c0b
compiler/rename/RnEnv.hs | 53 +++++++++++++++-------
compiler/rename/RnNames.hs | 45 +++++++++++-------
compiler/rename/RnPat.hs | 2 +-
compiler/typecheck/TcCanonical.hs | 6 +--
compiler/typecheck/TcDeriv.hs | 12 ++---
compiler/typecheck/TcRnDriver.hs | 13 +++++-
compiler/typecheck/TcRnMonad.hs | 7 ++-
compiler/typecheck/TcRnTypes.hs | 4 +-
compiler/typecheck/TcSMonad.hs | 10 ++--
.../should_fail/overloadedrecfldsfail06.hs | 13 ++----
.../should_fail/overloadedrecfldsfail06.stderr | 9 ----
11 files changed, 104 insertions(+), 70 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 9531e9e17fe762e06104bfa6202ea4f8e6970c0b
More information about the ghc-commits
mailing list