summaryrefslogtreecommitdiff
path: root/libraries/base/Control
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-10-19 14:15:14 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2014-10-19 14:19:42 +0200
commitb5930f8b8030350eff306bf56ba7607098ada61e (patch)
tree29ba06c83156144c0082e8df9a7ccbb0a5f153b4 /libraries/base/Control
parentd576fc38d9493c4979217fa36565f1f97fcc03d4 (diff)
downloadhaskell-b5930f8b8030350eff306bf56ba7607098ada61e.tar.gz
Refactor module imports in base
This commit removes a couple of {-# OPTIONS_GHC -fno-warn-unused-imports #-} by cleaning up the imports, as well as ensuring that all modules in the GHC.* hierarchy avoid importing the `Prelude` module to clean-up the import graph a bit.
Diffstat (limited to 'libraries/base/Control')
-rw-r--r--libraries/base/Control/Concurrent.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/libraries/base/Control/Concurrent.hs b/libraries/base/Control/Concurrent.hs
index c12fef54b0..702d0bb3b4 100644
--- a/libraries/base/Control/Concurrent.hs
+++ b/libraries/base/Control/Concurrent.hs
@@ -4,7 +4,6 @@
, UnboxedTuples
, ScopedTypeVariables
#-}
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
{-# OPTIONS_GHC -fno-warn-deprecations #-}
-- kludge for the Control.Concurrent.QSem, Control.Concurrent.QSemN
-- and Control.Concurrent.SampleVar imports.
@@ -106,11 +105,9 @@ module Control.Concurrent (
import Control.Exception.Base as Exception
-import GHC.Exception
import GHC.Conc hiding (threadWaitRead, threadWaitWrite,
threadWaitReadSTM, threadWaitWriteSTM)
-import qualified GHC.Conc
-import GHC.IO ( IO(..), unsafeInterleaveIO, unsafeUnmask )
+import GHC.IO ( unsafeUnmask )
import GHC.IORef ( newIORef, readIORef, writeIORef )
import GHC.Base
@@ -122,6 +119,8 @@ import Foreign.C.Types
import Foreign.C
import System.IO
import Data.Functor ( void )
+#else
+import qualified GHC.Conc
#endif
import Control.Concurrent.MVar