[commit: ghc] master: Revert accidental wip/generics-propeq-conservative merge (6d84b66)

git at git.haskell.org git at git.haskell.org
Fri Sep 19 08:18:59 UTC 2014


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6d84b66285a376c0d052c20a90ad88da5ac02026/ghc

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

commit 6d84b66285a376c0d052c20a90ad88da5ac02026
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Sep 19 10:13:16 2014 +0200

    Revert accidental wip/generics-propeq-conservative merge
    
    This commit reverts the commits
    
       e12a6a8 Propositional equality for Datatype meta-information
       0a8e6fc Make constructor metadata parametrized (with intended parameter <- datatype)
       f097b77 Implement sameConstructor
       cc618e6 get roles right and fix a FIXME
       79c7125 Actually parametrize the Constructor with the Datatype
       7bd4bab Supply a reasonable name (should be derived from d_name tho)
       09fcd70 Use 'd_name' as the name (should be derived from d_name tho)
       4d90e44 Add default case (fixes -Werror)
    
    and effectively resets ghc.git to the state it was at commit
    8c79dcb4dc2c6b8b663fa0c2e61d40d0ac0e9996


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

6d84b66285a376c0d052c20a90ad88da5ac02026
 compiler/typecheck/TcGenGenerics.lhs | 34 ++++++++++-----------
 libraries/base/GHC/Generics.hs       | 57 ++++++++----------------------------
 2 files changed, 29 insertions(+), 62 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 6d84b66285a376c0d052c20a90ad88da5ac02026


More information about the ghc-commits mailing list