[commit: ghc] wip/tc/typeable-with-kinds: Fix fallout from TypeRep changes (6b0508c)

git at git.haskell.org git at git.haskell.org
Sat Mar 7 16:43:50 UTC 2015


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

On branch  : wip/tc/typeable-with-kinds
Link       : http://ghc.haskell.org/trac/ghc/changeset/6b0508cd6afc675db8c9f83c0e68e695d6a26725/ghc

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

commit 6b0508cd6afc675db8c9f83c0e68e695d6a26725
Author: Austin Seipp <austin at well-typed.com>
Date:   Thu Mar 5 20:30:47 2015 -0600

    Fix fallout from TypeRep changes
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

6b0508cd6afc675db8c9f83c0e68e695d6a26725
 libraries/base/Data/Typeable/Internal.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/base/Data/Typeable/Internal.hs b/libraries/base/Data/Typeable/Internal.hs
index 9341ca9..4cdc57d 100644
--- a/libraries/base/Data/Typeable/Internal.hs
+++ b/libraries/base/Data/Typeable/Internal.hs
@@ -198,7 +198,7 @@ tyConString = tyConName
 --
 -- @since 4.8.0.0
 typeRepHash :: TypeRep -> Fingerprint
-typeRepHash (TypeRep fpr _ _) = fpr
+typeRepHash (TypeRep fpr _ _ _) = fpr
 
 -------------------------------------------------------------
 --
@@ -298,7 +298,7 @@ isTupleTyCon _                         = False
 --
 -- @since 4.8.0.0
 rnfTypeRep :: TypeRep -> ()
-rnfTypeRep (TypeRep _ tyc tyrs) = rnfTyCon tyc `seq` go tyrs
+rnfTypeRep (TypeRep _ tyc krs tyrs) = rnfTyCon tyc `seq` go krs `seq` go tyrs
   where
     go [] = ()
     go (x:xs) = rnfTypeRep x `seq` go xs



More information about the ghc-commits mailing list