[commit: ghc] wip/T8503: Use newTyConInstRhs in coerce’d GND (6d24bf8)

git at git.haskell.org git at git.haskell.org
Fri Nov 22 13:50:34 UTC 2013


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

On branch  : wip/T8503
Link       : http://ghc.haskell.org/trac/ghc/changeset/6d24bf811931f86a3e4f92270a03a563c4421eea/ghc

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

commit 6d24bf811931f86a3e4f92270a03a563c4421eea
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Nov 22 11:16:55 2013 +0000

    Use newTyConInstRhs in coerce’d GND


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

6d24bf811931f86a3e4f92270a03a563c4421eea
 compiler/typecheck/TcDeriv.lhs |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index e6265eb..80db6f8 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -1942,11 +1942,7 @@ genInst standalone_deriv oflag comauxs
                                                 , ib_standalone_deriving = standalone_deriv } }
        ; return ( inst_info, deriv_stuff, Nothing ) }
   where
-    (etad_tvs, etad_rhs) = newTyConEtadRhs rep_tycon
-      -- it's possible the eta-reduced rhs is overly-reduced.
-      -- pad as necessary
-    pad_tys = dropList etad_tvs rep_tc_args
-    rhs_ty = mkAppTys etad_rhs pad_tys
+    rhs_ty = newTyConInstRhs rep_tycon rep_tc_args
 
 genDerivStuff :: SrcSpan -> FixityEnv -> Class -> Name -> TyCon
               -> Maybe CommonAuxiliary



More information about the ghc-commits mailing list