[commit: packages/base] master: Import Coercible from GHC.Types (172dc4b)

git at git.haskell.org git at git.haskell.org
Sun Mar 16 17:54:08 UTC 2014


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/172dc4b451579512024eb6d8d70da1671b32e05b/base

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

commit 172dc4b451579512024eb6d8d70da1671b32e05b
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Mar 16 18:35:00 2014 +0100

    Import Coercible from GHC.Types


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

172dc4b451579512024eb6d8d70da1671b32e05b
 Data/Coerce.hs |    3 ++-
 Data/Data.hs   |    2 +-
 GHC/Exts.hs    |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Data/Coerce.hs b/Data/Coerce.hs
index 2065159..b00144b 100644
--- a/Data/Coerce.hs
+++ b/Data/Coerce.hs
@@ -24,4 +24,5 @@ module Data.Coerce
         ( -- * Safe coercions
           coerce, Coercible,
         ) where
-import GHC.Prim (coerce, Coercible)
+import GHC.Prim (coerce)
+import GHC.Types (Coercible)
diff --git a/Data/Data.hs b/Data/Data.hs
index 24f72d4..a12a6d7 100644
--- a/Data/Data.hs
+++ b/Data/Data.hs
@@ -116,10 +116,10 @@ import Control.Monad
 -- Imports for the instances
 import Data.Int              -- So we can give Data instance for Int8, ...
 import Data.Type.Coercion
+import Data.Coerce
 import Data.Word             -- So we can give Data instance for Word8, ...
 import GHC.Real( Ratio(..) ) -- So we can give Data instance for Ratio
 --import GHC.IOBase            -- So we can give Data instance for IO, Handle
-import GHC.Prim
 import GHC.Ptr               -- So we can give Data instance for Ptr
 import GHC.ForeignPtr        -- So we can give Data instance for ForeignPtr
 --import GHC.Stable            -- So we can give Data instance for StablePtr
diff --git a/GHC/Exts.hs b/GHC/Exts.hs
index efdf868..05e7281 100755
--- a/GHC/Exts.hs
+++ b/GHC/Exts.hs
@@ -73,8 +73,8 @@ module GHC.Exts
 
 import Prelude
 
-import GHC.Prim hiding (coerce, Coercible)
-import GHC.Base hiding (coerce, Coercible) -- implicitly comes from GHC.Prim
+import GHC.Prim hiding (coerce)
+import GHC.Base hiding (coerce) -- implicitly comes from GHC.Prim
 import GHC.Word
 import GHC.Int
 import GHC.Ptr



More information about the ghc-commits mailing list