[commit: ghc] wip/ttypeable: Revert OccName changes (db8ec27)

git at git.haskell.org git at git.haskell.org
Sun Jan 29 20:22:28 UTC 2017


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

On branch  : wip/ttypeable
Link       : http://ghc.haskell.org/trac/ghc/changeset/db8ec27033daeb9add9baf71ba1e5fe498d0ddd9/ghc

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

commit db8ec27033daeb9add9baf71ba1e5fe498d0ddd9
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Jan 29 01:12:19 2017 -0500

    Revert OccName changes


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

db8ec27033daeb9add9baf71ba1e5fe498d0ddd9
 compiler/basicTypes/OccName.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/basicTypes/OccName.hs b/compiler/basicTypes/OccName.hs
index 83cb41a..0de9801 100644
--- a/compiler/basicTypes/OccName.hs
+++ b/compiler/basicTypes/OccName.hs
@@ -73,7 +73,7 @@ module OccName (
         mkPReprTyConOcc,
         mkPADFunOcc,
         mkRecFldSelOcc,
-        mkTyConRepOcc, mkKindRepOcc,
+        mkTyConRepOcc,
 
         -- ** Deconstruction
         occNameFS, occNameString, occNameSpace,
@@ -610,7 +610,7 @@ mkDataConWrapperOcc, mkWorkerOcc,
         mkDataConWorkerOcc, mkNewTyCoOcc,
         mkInstTyCoOcc, mkEqPredCoOcc, mkClassOpAuxOcc,
         mkCon2TagOcc, mkTag2ConOcc, mkMaxTagOcc,
-        mkTyConRepOcc, mkKindRepOcc
+        mkTyConRepOcc
    :: OccName -> OccName
 
 -- These derived variables have a prefix that no Haskell value could have
@@ -640,7 +640,6 @@ mkTyConRepOcc occ = mk_simple_deriv varName prefix occ
   where
     prefix | isDataOcc occ = "$tc'"
            | otherwise     = "$tc"
-mkKindRepOcc = mk_simple_deriv varName "$tk"
 
 -- Generic deriving mechanism
 mkGenR   = mk_simple_deriv tcName "Rep_"



More information about the ghc-commits mailing list