Resolve minor issues

haskell · Apr 18, 2023 · 6c2ad14 · 6c2ad14
1 parent 8af5f44
commit 6c2ad14
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/Data/Text/Internal/Validate.hs b/src/Data/Text/Internal/Validate.hs
@@ -28,7 +28,6 @@ module Data.Text.Internal.Validate
   ) where
 
 import Data.Array.Byte (ByteArray(ByteArray))
-import GHC.Exts (ByteArray#)
 import Data.ByteString (ByteString)
 import GHC.Exts (isTrue#,isByteArrayPinned#)
 
@@ -38,6 +37,7 @@ import Data.Text.Internal.ByteStringCompat (withBS)
 import Data.Text.Internal.Unsafe (unsafeWithForeignPtr)
 import Data.Text.Internal.Validate.Simd (c_is_valid_utf8_bytearray_safe,c_is_valid_utf8_bytearray_unsafe,c_is_valid_utf8_ptr_unsafe)
 #else
+import GHC.Exts (ByteArray#)
 import Data.Text.Internal.Encoding.Utf8 (CodePoint(..),DecoderResult(..),utf8DecodeStart,utf8DecodeContinue)
 import GHC.Exts (Int(I#),indexWord8Array#)
 import GHC.Word (Word8(W8#))

diff --git a/src/Data/Text/Internal/Validate/Simd.hs b/src/Data/Text/Internal/Validate/Simd.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE UnliftedFFITypes #-}
 

diff --git a/text.cabal b/text.cabal
@@ -73,7 +73,7 @@ flag developer
   manual: True
 
 flag simdutf
-  description: use simdutf library
+  description: use simdutf library, causes Data.Text.Internal.Validate.Simd to be exposed
   default: True
   manual: True
 
@@ -137,10 +137,6 @@ library
   if flag(simdutf) && os(netbsd) && impl(ghc < 9.4)
     build-depends: base < 0
 
-  -- Before GHC 9.4, Data.Array.Byte is not in base
-  if impl(ghc < 9.4)
-    build-depends: data-array-byte >= 0.1.0.1
-
   exposed-modules:
     Data.Text
     Data.Text.Array