Bytezap: fix deprecation warnings

raehik · Aug 18, 2023 · 3a417bf · 3a417bf
1 parent e2664c4
commit 3a417bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Bytezap/Bytes.hs b/src/Bytezap/Bytes.hs
@@ -12,6 +12,7 @@ import Data.ByteString.Internal qualified as B
 import GHC.IO
 import Data.Word
 import Foreign.ForeignPtr
+import Foreign.Marshal.Utils qualified
 
 byteString :: B.ByteString -> Write
 byteString (B.BS fptr len) = Write len (pokeForeignPtr fptr len)
@@ -25,7 +26,8 @@ pokeForeignPtr fptr len@(I# len#) = poke $ \addr# st# ->
 
 memcpyForeignPtr :: Ptr Word8 -> ForeignPtr Word8 -> Int -> IO ()
 memcpyForeignPtr ptrTo fptrFrom len =
-    B.unsafeWithForeignPtr fptrFrom $ \ptrFrom -> B.memcpy ptrTo ptrFrom len
+    B.unsafeWithForeignPtr fptrFrom $ \ptrFrom ->
+        Foreign.Marshal.Utils.copyBytes ptrTo ptrFrom len
 {-# INLINE memcpyForeignPtr #-}
 
 pokeByteArray# :: ByteArray# -> Int# -> Int# -> Poke
@@ -37,5 +39,5 @@ pokeByteArray# arr# off# len# = poke $ \addr# st# ->
 -- TODO this seems to work but like, really? wow lol
 pokeByteReplicate :: Int -> Word8 -> Poke
 pokeByteReplicate n@(I# n#) w8 = poke $ \addr# st# ->
-    case unIO (B.memset (Ptr addr#) w8 (fromIntegral n)) st# of
+    case unIO (Foreign.Marshal.Utils.fillBytes (Ptr addr#) w8 (fromIntegral n)) st# of
       (# st'#, _ #) -> (# st'#, addr# `plusAddr#` n# #)
diff --git a/src/Bytezap/Poke/Bytes.hs b/src/Bytezap/Poke/Bytes.hs
@@ -10,6 +10,7 @@ import Data.ByteString.Internal qualified as B
 import GHC.IO
 import Data.Word
 import Foreign.ForeignPtr
+import Foreign.Marshal.Utils qualified
 
 byteString :: B.ByteString -> Poke
 byteString (B.BS fptr len) = pokeForeignPtr fptr len
@@ -23,7 +24,8 @@ pokeForeignPtr fptr len@(I# len#) = poke $ \addr# st# ->
 
 memcpyForeignPtr :: Ptr Word8 -> ForeignPtr Word8 -> Int -> IO ()
 memcpyForeignPtr ptrTo fptrFrom len =
-    B.unsafeWithForeignPtr fptrFrom $ \ptrFrom -> B.memcpy ptrTo ptrFrom len
+    B.unsafeWithForeignPtr fptrFrom $ \ptrFrom ->
+        Foreign.Marshal.Utils.copyBytes ptrTo ptrFrom len
 {-# INLINE memcpyForeignPtr #-}
 
 pokeByteArray# :: ByteArray# -> Int# -> Int# -> Poke