diff --git a/libraries/base/Data/Typeable.hs b/libraries/base/Data/Typeable.hs index 7e501a5fe8c8689750fe9a5560dd2a2186104657..c30a43dd6525d7da1fd71ae81e1a25251660d5ce 100644 --- a/libraries/base/Data/Typeable.hs +++ b/libraries/base/Data/Typeable.hs @@ -61,12 +61,12 @@ module Data.Typeable -- * Type representations TypeRep, -- abstract, instance of: Eq, Show, Typeable - typeRepHash, + typeRepFingerprint, rnfTypeRep, showsTypeRep, TyCon, -- abstract, instance of: Eq, Show, Typeable - tyConHash, + tyConFingerprint, tyConString, tyConPackage, tyConModule, diff --git a/libraries/base/Data/Typeable/Internal.hs b/libraries/base/Data/Typeable/Internal.hs index 4cdc57de227eb89eb2cbccf3723523ada6bcf00d..60402f32ce2cb01362d79d3fca79fdfa57c8c615 100644 --- a/libraries/base/Data/Typeable/Internal.hs +++ b/libraries/base/Data/Typeable/Internal.hs @@ -45,7 +45,7 @@ module Data.Typeable.Internal ( splitPolyTyConApp, funResultTy, typeRepArgs, - typeRepHash, + typeRepFingerprint, rnfTypeRep, showsTypeRep, tyConString, @@ -84,7 +84,7 @@ instance Ord TypeRep where -- | An abstract representation of a type constructor. 'TyCon' objects can -- be built using 'mkTyCon'. data TyCon = TyCon { - tyConHash :: {-# UNPACK #-} !Fingerprint, -- ^ @since 4.8.0.0 + tyConFingerprint :: {-# UNPACK #-} !Fingerprint, -- ^ @since 4.8.0.0 tyConPackage :: String, -- ^ @since 4.5.0.0 tyConModule :: String, -- ^ @since 4.5.0.0 tyConName :: String -- ^ @since 4.5.0.0 @@ -197,8 +197,8 @@ tyConString = tyConName -- | Observe the 'Fingerprint' of a type representation -- -- @since 4.8.0.0 -typeRepHash :: TypeRep -> Fingerprint -typeRepHash (TypeRep fpr _ _ _) = fpr +typeRepFingerprint :: TypeRep -> Fingerprint +typeRepFingerprint (TypeRep fpr _ _ _) = fpr ------------------------------------------------------------- -- @@ -338,7 +338,7 @@ typeLitTypeRep nm = rep where rep = mkTyConApp tc [] tc = TyCon - { tyConHash = fingerprintString (mk pack modu nm) + { tyConFingerprint = fingerprintString (mk pack modu nm) , tyConPackage = pack , tyConModule = modu , tyConName = nm diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md index e99c1b185410aa955705863a3b0e3bbb0c0dee85..e2318a8d9247be65e71c672b2f12166e9a3362f2 100644 --- a/libraries/base/changelog.md +++ b/libraries/base/changelog.md @@ -142,8 +142,8 @@ * Restore invariant in `Data (Ratio a)` instance (#10011) - * Add/expose `rnfTypeRep`, `rnfTyCon`, `TypeRepHash`, and - `TyConHash` helpers to `Data.Typeable`. + * Add/expose `rnfTypeRep`, `rnfTyCon`, `typeRepFingerprint`, and + `tyConFingerprint` helpers to `Data.Typeable`. * Define proper `MINIMAL` pragma for `class Ix`. (#10142)