summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryanglscott <>2020-02-28 11:47:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2020-02-28 11:47:00 (GMT)
commitfc5f2fcefb4a9ed62ab90124d511eb5bc72a013c (patch)
tree5f79c67fe12be6ab90d92274283bb82aaa200ba1
parent0b10b40578e875d670f1393cc4c28a6d02925667 (diff)
version 3.8.5HEAD3.8.5master
-rwxr-xr-xCHANGELOG.md3
-rw-r--r--src/TextShow/Control/Concurrent.hs2
-rw-r--r--src/TextShow/Data/Integral.hs6
-rw-r--r--src/TextShow/Data/Typeable.hs6
-rw-r--r--src/TextShow/Foreign/Ptr.hs2
-rw-r--r--src/TextShow/TH/Internal.hs2
-rw-r--r--src/TextShow/Utils.hs3
-rw-r--r--text-show.cabal4
8 files changed, 13 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32b7346..61777e7 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 3.8.5 [2020.02.28]
+* Import from `GHC.Exts`, not `GHC.Prim`.
+
### 3.8.4 [2020.01.28]
* Update the `TextShow(1)` instances for `Down` and `ThreadId` to match their
implementations in `base-4.14`.
diff --git a/src/TextShow/Control/Concurrent.hs b/src/TextShow/Control/Concurrent.hs
index 0d3c510..8a6f6e9 100644
--- a/src/TextShow/Control/Concurrent.hs
+++ b/src/TextShow/Control/Concurrent.hs
@@ -24,7 +24,7 @@ import Foreign.C.Types
import GHC.Conc (BlockReason, ThreadStatus)
import GHC.Conc.Sync (ThreadId(..))
-import GHC.Prim
+import GHC.Exts (Addr#, unsafeCoerce#)
import Prelude ()
import Prelude.Compat
diff --git a/src/TextShow/Data/Integral.hs b/src/TextShow/Data/Integral.hs
index d43d417..cfdd987 100644
--- a/src/TextShow/Data/Integral.hs
+++ b/src/TextShow/Data/Integral.hs
@@ -28,12 +28,10 @@ import Data.Text.Lazy.Builder (Builder, singleton)
import Data.Text.Lazy.Builder.Int (decimal)
import Data.Word (Word8, Word16, Word32, Word64)
-import GHC.Exts (Int(I#))
+import GHC.Exts (Int(I#), (<#), (>#))
#if __GLASGOW_HASKELL__ >= 708
-import GHC.Exts (isTrue#)
-import GHC.Prim (Int#)
+import GHC.Exts (Int#, isTrue#)
#endif
-import GHC.Prim ((<#), (>#))
import Prelude ()
import Prelude.Compat
diff --git a/src/TextShow/Data/Typeable.hs b/src/TextShow/Data/Typeable.hs
index 33e427a..78b283b 100644
--- a/src/TextShow/Data/Typeable.hs
+++ b/src/TextShow/Data/Typeable.hs
@@ -37,8 +37,7 @@ import Data.Kind (Type)
import Data.Text.Lazy.Builder (Builder, fromString, singleton)
import Data.Type.Equality ((:~~:)(..))
-import GHC.Exts (Char(..))
-import GHC.Prim (Addr#, (+#), eqChar#, indexCharOffAddr#)
+import GHC.Exts (Addr#, Char(..), (+#), eqChar#, indexCharOffAddr#)
import GHC.Types (Module(..), TrName(..), TyCon(..), isTrue#)
import TextShow.Classes (TextShow(..), TextShow1(..), showbParen, showbSpace)
@@ -65,8 +64,7 @@ import Data.Typeable.Internal (funTc, listTc)
# endif
# if MIN_VERSION_base(4,9,0)
-import GHC.Exts (Char(..))
-import GHC.Prim (Addr#, (+#), eqChar#, indexCharOffAddr#)
+import GHC.Exts (Addr#, Char(..), (+#), eqChar#, indexCharOffAddr#)
import GHC.Types (TyCon(..), TrName(..), Module(..), isTrue#)
# else
import Data.Typeable.Internal (TyCon)
diff --git a/src/TextShow/Foreign/Ptr.hs b/src/TextShow/Foreign/Ptr.hs
index 6200d8a..ff66d7c 100644
--- a/src/TextShow/Foreign/Ptr.hs
+++ b/src/TextShow/Foreign/Ptr.hs
@@ -22,10 +22,10 @@ import Data.Text.Lazy.Builder (Builder, singleton)
import Foreign.ForeignPtr (ForeignPtr)
import Foreign.Ptr (FunPtr, IntPtr, WordPtr, castFunPtrToPtr)
+import GHC.Exts (addr2Int#, int2Word#)
import GHC.ForeignPtr (unsafeForeignPtrToPtr)
import GHC.Num (wordToInteger)
import GHC.Ptr (Ptr(..))
-import GHC.Prim (addr2Int#, int2Word#)
import Prelude ()
import Prelude.Compat
diff --git a/src/TextShow/TH/Internal.hs b/src/TextShow/TH/Internal.hs
index 3845353..cf56c4e 100644
--- a/src/TextShow/TH/Internal.hs
+++ b/src/TextShow/TH/Internal.hs
@@ -75,12 +75,12 @@ import qualified Data.Text.Lazy as TL
import qualified Data.Text.Lazy.IO as TL (putStrLn, hPutStrLn)
import GHC.Exts ( Char(..), Double(..), Float(..), Int(..), Word(..)
+ , Char#, Double#, Float#, Int#, Word#
#if MIN_VERSION_base(4,13,0)
, Int8#, Int16#, Word8#, Word16#
, extendInt8#, extendInt16#, extendWord8#, extendWord16#
#endif
)
-import GHC.Prim (Char#, Double#, Float#, Int#, Word#)
import GHC.Show (appPrec, appPrec1)
import Language.Haskell.TH.Datatype
diff --git a/src/TextShow/Utils.hs b/src/TextShow/Utils.hs
index 4547ca6..ea0099f 100644
--- a/src/TextShow/Utils.hs
+++ b/src/TextShow/Utils.hs
@@ -29,8 +29,7 @@ import Data.Text (Text)
import Data.Text.Lazy (length, toStrict, unpack)
import Data.Text.Lazy.Builder (Builder, singleton, toLazyText)
-import GHC.Exts (Char(C#), Int(I#))
-import GHC.Prim ((+#), chr#, ord#)
+import GHC.Exts (Char(C#), Int(I#), (+#), chr#, ord#)
import Prelude ()
import Prelude.Compat hiding (length)
diff --git a/text-show.cabal b/text-show.cabal
index 0ce4217..078e399 100644
--- a/text-show.cabal
+++ b/text-show.cabal
@@ -1,5 +1,5 @@
name: text-show
-version: 3.8.4
+version: 3.8.5
synopsis: Efficient conversion of values into Text
description: @text-show@ offers a replacement for the @Show@ typeclass intended
for use with @Text@ instead of @String@s. This package was created
@@ -51,7 +51,7 @@ tested-with: GHC == 7.4.2
, GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
- , GHC == 8.8.1
+ , GHC == 8.8.2
extra-source-files: CHANGELOG.md, README.md, include/*.h
cabal-version: >=1.10