6 files changed, 1 insertions, 82 deletions
diff --git a/libraries/base/Control/Concurrent.hs b/libraries/base/Control/Concurrent.hs
index a53b1a8e91..2c0f98798b 100644
--- a/libraries/base/Control/Concurrent.hs
+++ b/libraries/base/Control/Concurrent.hs
@@ -107,9 +107,6 @@ module Control.Concurrent (
 
         -- $preemption
 
-        -- * Deprecated functions
-        forkIOUnmasked
-
     ) where
 
 import Prelude
diff --git a/libraries/base/Foreign.hs b/libraries/base/Foreign.hs
index dbdc90588b..43ee102830 100644
--- a/libraries/base/Foreign.hs
+++ b/libraries/base/Foreign.hs
@@ -25,14 +25,6 @@ module Foreign
         , module Foreign.StablePtr
         , module Foreign.Storable
         , module Foreign.Marshal
-
-        -- * Unsafe Functions
-
-        -- | 'unsafePerformIO' is exported here for backwards
-        -- compatibility reasons only.  For doing local marshalling in
-        -- the FFI, use 'unsafeLocalState'.  For other uses, see
-        -- 'System.IO.Unsafe.unsafePerformIO'.
-        , unsafePerformIO
         ) where
 
 import Data.Bits
@@ -44,12 +36,3 @@ import Foreign.StablePtr
 import Foreign.Storable
 import Foreign.Marshal
 
-import GHC.IO (IO)
-import qualified GHC.IO (unsafePerformIO)
-
-{-# DEPRECATED unsafePerformIO "Use System.IO.Unsafe.unsafePerformIO instead; This function will be removed in the next release" #-} -- deprecated in 7.2
-
-{-# INLINE unsafePerformIO #-}
-unsafePerformIO :: IO a -> a
-unsafePerformIO = GHC.IO.unsafePerformIO
-
diff --git a/libraries/base/Foreign/ForeignPtr.hs b/libraries/base/Foreign/ForeignPtr.hs
index be6dec0459..b980f502cd 100644
--- a/libraries/base/Foreign/ForeignPtr.hs
+++ b/libraries/base/Foreign/ForeignPtr.hs
@@ -48,17 +48,7 @@ module Foreign.ForeignPtr (
         , mallocForeignPtrBytes
         , mallocForeignPtrArray
         , mallocForeignPtrArray0
-        -- ** Unsafe low-level operations
-        , unsafeForeignPtrToPtr
     ) where
 
 import Foreign.ForeignPtr.Safe
 
-import Foreign.Ptr ( Ptr )
-import qualified Foreign.ForeignPtr.Unsafe as U
-
-{-# DEPRECATED unsafeForeignPtrToPtr "Use Foreign.ForeignPtr.Unsafe.unsafeForeignPtrToPtr instead; This function will be removed in the next release" #-} -- deprecated in 7.2
-{-# INLINE unsafeForeignPtrToPtr #-}
-unsafeForeignPtrToPtr :: ForeignPtr a -> Ptr a
-unsafeForeignPtrToPtr = U.unsafeForeignPtrToPtr
-
diff --git a/libraries/base/Foreign/Marshal.hs b/libraries/base/Foreign/Marshal.hs
index ef81cec75e..799596e464 100644
--- a/libraries/base/Foreign/Marshal.hs
+++ b/libraries/base/Foreign/Marshal.hs
@@ -20,37 +20,7 @@ module Foreign.Marshal
          -- | The module "Foreign.Marshal" re-exports the safe content in the
          -- @Foreign.Marshal@ hierarchy:
           module Foreign.Marshal.Safe
-         -- | and provides one function:
-        , unsafeLocalState
         ) where
 
 import Foreign.Marshal.Safe
 
-#ifdef __GLASGOW_HASKELL__
-import GHC.IO
-#else
-import System.IO.Unsafe
-#endif
-
-{- |
-Sometimes an external entity is a pure function, except that it passes
-arguments and/or results via pointers.  The function
-@unsafeLocalState@ permits the packaging of such entities as pure
-functions.  
-
-The only IO operations allowed in the IO action passed to
-@unsafeLocalState@ are (a) local allocation (@alloca@, @allocaBytes@
-and derived operations such as @withArray@ and @withCString@), and (b)
-pointer operations (@Foreign.Storable@ and @Foreign.Ptr@) on the
-pointers to local storage, and (c) foreign functions whose only
-observable effect is to read and/or write the locally allocated
-memory.  Passing an IO operation that does not obey these rules
-results in undefined behaviour.
-
-It is expected that this operation will be
-replaced in a future revision of Haskell.
--}
-{-# DEPRECATED unsafeLocalState "Please import from Foreign.Marshall.Unsafe instead; This will be removed in the next release" #-} -- deprecated in 7.2
-unsafeLocalState :: IO a -> a
-unsafeLocalState = unsafePerformIO
-
diff --git a/libraries/base/GHC/Conc.lhs b/libraries/base/GHC/Conc.lhs
index aa14b375fc..ded38d541e 100644
--- a/libraries/base/GHC/Conc.lhs
+++ b/libraries/base/GHC/Conc.lhs
@@ -31,11 +31,8 @@ module GHC.Conc
 
         -- * Forking and suchlike
         , forkIO
-        , forkIOUnmasked
         , forkIOWithUnmask
         , forkOn
-        , forkOnIO
-        , forkOnIOUnmasked
         , forkOnWithUnmask
         , numCapabilities
         , getNumCapabilities
diff --git a/libraries/base/GHC/Conc/Sync.lhs b/libraries/base/GHC/Conc/Sync.lhs
index 7c6c1b6d46..eb70e56ff5 100644
--- a/libraries/base/GHC/Conc/Sync.lhs
+++ b/libraries/base/GHC/Conc/Sync.lhs
@@ -42,11 +42,8 @@ module GHC.Conc.Sync
 
         -- * Forking and suchlike
         , forkIO
-        , forkIOUnmasked
         , forkIOWithUnmask
         , forkOn
-        , forkOnIO    -- DEPRECATED -- deprecated in 7.2
-        , forkOnIOUnmasked
         , forkOnWithUnmask
         , numCapabilities
         , getNumCapabilities
@@ -97,7 +94,7 @@ module GHC.Conc.Sync
         , sharedCAF
         ) where
 
-import Foreign hiding (unsafePerformIO)
+import Foreign
 import Foreign.C
 
 #ifdef mingw32_HOST_OS
@@ -208,11 +205,6 @@ forkIO action = IO $ \ s ->
  where
   action_plus = catchException action childHandler
 
-{-# DEPRECATED forkIOUnmasked "use forkIOWithUnmask instead" #-} -- deprecated in 7.2
--- | This function is deprecated; use 'forkIOWithUnmask' instead
-forkIOUnmasked :: IO () -> IO ThreadId
-forkIOUnmasked io = forkIO (unsafeUnmask io)
-
 -- | Like 'forkIO', but the child thread is passed a function that can
 -- be used to unmask asynchronous exceptions.  This function is
 -- typically used in the following way
@@ -258,16 +250,6 @@ forkOn (I# cpu) action = IO $ \ s ->
  where
   action_plus = catchException action childHandler
 
-{-# DEPRECATED forkOnIO "renamed to forkOn" #-} -- deprecated in 7.2
--- | This function is deprecated; use 'forkOn' instead
-forkOnIO :: Int -> IO () -> IO ThreadId
-forkOnIO = forkOn
-
-{-# DEPRECATED forkOnIOUnmasked "use forkOnWithUnmask instead" #-} -- deprecated in 7.2
--- | This function is deprecated; use 'forkOnWIthUnmask' instead
-forkOnIOUnmasked :: Int -> IO () -> IO ThreadId
-forkOnIOUnmasked cpu io = forkOn cpu (unsafeUnmask io)
-
 -- | Like 'forkIOWithUnmask', but the child thread is pinned to the
 -- given CPU, as with 'forkOn'.
 forkOnWithUnmask :: Int -> ((forall a . IO a -> IO a) -> IO ()) -> IO ThreadId