diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2013-09-15 23:49:32 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2013-09-17 10:41:44 +0200 |
| commit | 8f9f1009b89a54bcab8354a255f1372803f780ce (patch) | |
| tree | 3a70900a5917328421472111aae401d832a6c2ae /libraries/base/Data/Data.hs | |
| parent | 0f5eae0232a86ec57d841a83e6929361e2751270 (diff) | |
| download | haskell-8f9f1009b89a54bcab8354a255f1372803f780ce.tar.gz | |
Make `<Typeable.h>` obsolete and refactor away its use
With GHC 7.8's PolyKinds the macros in `<Typeable.h>` are no longer of any
use, and their use is clearly obsolete. The sites using those macros are
replaced by auto-derivations of `Typeable` instances.
This reduces reliance on the CPP extension and the compile dependency on
`Typeable.h` in a couple of modules.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'libraries/base/Data/Data.hs')
| -rw-r--r-- | libraries/base/Data/Data.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libraries/base/Data/Data.hs b/libraries/base/Data/Data.hs index 762d96b32f..6eedd2c222 100644 --- a/libraries/base/Data/Data.hs +++ b/libraries/base/Data/Data.hs @@ -1,5 +1,5 @@ {-# LANGUAGE Trustworthy, FlexibleInstances #-} -{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, PolyKinds #-} +{-# LANGUAGE RankNTypes, ScopedTypeVariables, PolyKinds #-} {-# LANGUAGE StandaloneDeriving, DeriveDataTypeable, TypeOperators, GADTs #-} @@ -125,9 +125,6 @@ import GHC.ForeignPtr -- So we can give Data instance for ForeignPtr --import GHC.Conc -- So we can give Data instance for MVar & Co. import GHC.Arr -- So we can give Data instance for Array -#include "Typeable.h" - - ------------------------------------------------------------------------------ -- |