Remove inlinePerformIO

haskell · Sep 15, 2020 · 444c475 · 444c475
1 parent 43077f6
commit 444c475
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/Data/ByteString/Internal.hs b/Data/ByteString/Internal.hs
@@ -87,7 +87,6 @@ module Data.ByteString.Internal (
 
         -- * Deprecated and unmentionable
         accursedUnutterablePerformIO, -- :: IO a -> a
-        inlinePerformIO,              -- :: IO a -> a
 
         -- * Exported compatibility shim
         plusForeignPtr
@@ -719,11 +718,6 @@ overflowError fun = error $ "Data.ByteString." ++ fun ++ ": size overflow"
 accursedUnutterablePerformIO :: IO a -> a
 accursedUnutterablePerformIO (IO m) = case m realWorld# of (# _, r #) -> r
 
-inlinePerformIO :: IO a -> a
-inlinePerformIO = accursedUnutterablePerformIO
-{-# INLINE inlinePerformIO #-}
-{-# DEPRECATED inlinePerformIO "If you think you know what you are doing, use 'System.IO.Unsafe.unsafePerformIO'. If you are sure you know what you are doing, use 'unsafeDupablePerformIO'. If you enjoy sharing an address space with a malevolent agent of chaos, try 'accursedUnutterablePerformIO'." #-}
-
 -- ---------------------------------------------------------------------
 --
 -- Standard C functions

diff --git a/tests/Hash.hs b/tests/Hash.hs
@@ -69,7 +69,7 @@ eq a@(S.BS p l) b@(S.BS p' l')
          | p == p'   = True     -- short cut for the same string
          | otherwise = compare a b == EQ
   where
-    compare (S.BS fp1 len1) (S.BS fp2 len2) = S.inlinePerformIO $
+    compare (S.BS fp1 len1) (S.BS fp2 len2) = S.accursedUnutterablePerformIO $
         withForeignPtr fp1 $ \p1 ->
             withForeignPtr fp2 $ \p2 ->
                 cmp p1 p2 0 len1 len2

diff --git a/tests/Words.hs b/tests/Words.hs
@@ -38,8 +38,8 @@ compareBytes :: ByteString -> ByteString -> Ordering
 compareBytes (BS fp1 len1) (BS fp2 len2)
     | len1 == 0  && len2 == 0     = EQ  -- short cut for empty strings
     | fp1 == fp2 && len1 == len2  = EQ  -- short cut for the same string
---  | max len1 len2 > 1                           = inlinePerformIO $
-    | otherwise                                   = inlinePerformIO $
+--  | max len1 len2 > 1                           = accursedUnutterablePerformIO $
+    | otherwise                                   = accursedUnutterablePerformIO $
     withForeignPtr fp1 $ \p1 ->
     withForeignPtr fp2 $ \p2 -> do
         i <- memcmp p1 p2 (fromIntegral $ min len1 len2)
@@ -49,7 +49,7 @@ compareBytes (BS fp1 len1) (BS fp2 len2)
 
 
 {-
-    | otherwise                                   = inlinePerformIO $
+    | otherwise                                   = accursedUnutterablePerformIO $
     withForeignPtr fp1 $ \p1 ->
         withForeignPtr fp2 $ \p2 ->
             cmp (p1 `plusPtr` off1)

diff --git a/tests/test-compare.hs b/tests/test-compare.hs
@@ -40,11 +40,11 @@ compareBytes :: ByteString -> ByteString -> Ordering
 compareBytes (BS fp1 len1) (BS fp2 len2)
 --    | len1 == 0  && len2 == 0     = EQ  -- short cut for empty strings
 --    | fp1 == fp2 && len1 == len2  = EQ  -- short cut for the same string
-    | otherwise                                   = inlinePerformIO $
+    | otherwise                                   = accursedUnutterablePerformIO $
     withForeignPtr fp1 $ \p1 ->
         withForeignPtr fp2 $ \p2 ->
             cmp p1 p2 0 len1 len2
- 
+
 cmp :: Ptr Word8 -> Ptr Word8 -> Int -> Int -> Int-> IO Ordering
 cmp p1 p2 n len1 len2
       | n == len1 = if n == len2 then return EQ else return LT
@@ -56,11 +56,11 @@ cmp p1 p2 n len1 len2
                 EQ -> cmp p1 p2 (n+1) len1 len2
                 LT -> return LT
                 GT -> return GT
- 
+
 compareBytesC (BS x1 l1) (BS x2 l2)
     | l1 == 0  && l2 == 0   = EQ  -- short cut for empty strings
     | x1 == x2 && l1 == l2  = EQ  -- short cut for the same string
-    | otherwise                         = inlinePerformIO $
+    | otherwise                         = accursedUnutterablePerformIO $
         withForeignPtr x1 $ \p1 ->
         withForeignPtr x2 $ \p2 -> do
             i <- memcmp p1 p2 (fromIntegral $ min l1 l2)