git.iko.soy/streamly
on master help sign in
Rename Foreign.unsafeAsPtr as Foreign.asPtrUnsafe
commit58bae3dfbdf174c840580000c91c2fa80b991924 authorAdithya Kumar <adithya@composewell.com> dateSun 6 Feb 2022, 03:12 (5 years ago) parent029a81a
3 files changed+3−15
compare with master
unifiedsplit
src/Streamly/Internal/Data/Array/Foreign.hs+1−13 src/Streamly/Internal/FileSystem/Event/Darwin.hs+1−1 src/Streamly/Internal/FileSystem/Event/Linux.hs+1−1
src/Streamly/Internal/Data/Array/Foreign.hs+1−13
@@ -92,7 +92,7 @@ module Streamly.Internal.Data.Array.Foreign
9292 , cast
9393 , asBytes
9494 , unsafeCast -- castUnsafe?
95− , unsafeAsPtr -- asPtrUnsafe?
95+ , asPtrUnsafe
9696 , unsafeAsCString -- asCStringUnsafe?
9797 , A.unsafeFreeze -- asImmutableUnsafe?
9898 , A.unsafeThaw -- asMutableUnsafe?
@@ -129,8 +129,6 @@ import Foreign.Ptr (plusPtr, castPtr)
129129import Foreign.Storable (Storable(..))
130130import Prelude hiding (length, null, last, map, (!!), read, concat)
131131
132−import GHC.Ptr (Ptr(..))
133−
134132import Streamly.Internal.Data.Array.Foreign.Mut.Type (ReadUState(..), touch)
135133import Streamly.Internal.Data.Array.Foreign.Type
136134 (Array(..), length, asPtrUnsafe)
@@ -555,16 +553,6 @@ cast arr =
555553 then Nothing
556554 else Just $ unsafeCast arr
557555
558−-- | Use an @Array a@ as @Ptr b@.
559−--
560−-- /Unsafe/
561−--
562−-- /Pre-release/
563−--
564−unsafeAsPtr :: Array a -> (Ptr b -> IO c) -> IO c
565−unsafeAsPtr arr act = do
566− asPtrUnsafe arr $ \ptr -> act (castPtr ptr)
567−
568556-- | Convert an array of any type into a null terminated CString Ptr.
569557--
570558-- /Unsafe/
src/Streamly/Internal/FileSystem/Event/Darwin.hs+1−1
@@ -458,7 +458,7 @@ openWatch Config{..} paths = do
458458
459459 withPathName :: Array Word8 -> (PathName -> IO a) -> IO a
460460 withPathName arr act = do
461− A.unsafeAsPtr arr $ \ptr ->
461+ A.asPtrUnsafe arr $ \ptr ->
462462 let pname = PathName (castPtr ptr) (fromIntegral (A.length arr))
463463 in act pname
464464
src/Streamly/Internal/FileSystem/Event/Linux.hs+1−1
@@ -836,7 +836,7 @@ readOneEvent :: Config -> Watch -> Parser IO Word8 Event
836836readOneEvent cfg wt@(Watch _ wdMap) = do
837837 let headerLen = sizeOf (undefined :: CInt) + 12
838838 arr <- PR.takeEQ headerLen (A.writeN headerLen)
839− (ewd, eflags, cookie, pathLen) <- PR.fromEffect $ A.unsafeAsPtr arr readHeader
839+ (ewd, eflags, cookie, pathLen) <- PR.fromEffect $ A.asPtrUnsafe arr readHeader
840840 -- XXX need the "initial" in parsers to return a step type so that "take 0"
841841 -- can return without an input. otherwise if pathLen is 0 we will keep
842842 -- waiting to read one more char before we return this event.