[commit: ghc] master: Simplify import-graph a bit more (e7c1633)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e7c1633203e33c4a1af866c8658683bcef20a514/ghc

>---------------------------------------------------------------

commit e7c1633203e33c4a1af866c8658683bcef20a514
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Sep 21 10:46:19 2014 +0200

    Simplify import-graph a bit more
    
    This is preparatory refactoring for avoiding import cycles
    when `Data.Traversable` will be imported by `Control.Monad` and
    `Data.List` for implementing #9586


>---------------------------------------------------------------

e7c1633203e33c4a1af866c8658683bcef20a514
 libraries/base/Foreign/Marshal/Pool.hs | 2 +-
 libraries/base/GHC/Event/Thread.hs     | 2 +-
 libraries/base/GHC/IO/Encoding.hs      | 2 +-
 libraries/base/System/IO.hs            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/base/Foreign/Marshal/Pool.hs b/libraries/base/Foreign/Marshal/Pool.hs
index 1488e0f..78d069a 100644
--- a/libraries/base/Foreign/Marshal/Pool.hs
+++ b/libraries/base/Foreign/Marshal/Pool.hs
@@ -54,7 +54,7 @@ import GHC.IORef             ( IORef, newIORef, readIORef, writeIORef )
 import GHC.List              ( elem, length )
 import GHC.Num               ( Num(..) )
 
-import Data.List             ( delete )
+import Data.OldList          ( delete )
 import Foreign.Marshal.Alloc ( mallocBytes, reallocBytes, free )
 import Foreign.Marshal.Array ( pokeArray, pokeArray0 )
 import Foreign.Marshal.Error ( throwIf )
diff --git a/libraries/base/GHC/Event/Thread.hs b/libraries/base/GHC/Event/Thread.hs
index f74fb7d..6fe7689 100644
--- a/libraries/base/GHC/Event/Thread.hs
+++ b/libraries/base/GHC/Event/Thread.hs
@@ -18,12 +18,12 @@ module GHC.Event.Thread
 import Control.Exception (finally, SomeException, toException)
 import Control.Monad (forM, forM_, sequence_, zipWithM)
 import Data.IORef (IORef, newIORef, readIORef, writeIORef)
-import Data.List (zipWith3)
 import Data.Tuple (snd)
 import Foreign.C.Error (eBADF, errnoToIOError)
 import Foreign.C.Types (CInt(..), CUInt(..))
 import Foreign.Ptr (Ptr)
 import GHC.Base
+import GHC.List (zipWith3)
 import GHC.Conc.Sync (TVar, ThreadId, ThreadStatus(..), atomically, forkIO,
                       labelThread, modifyMVar_, withMVar, newTVar, sharedCAF,
                       getNumCapabilities, threadCapability, myThreadId, forkOn,
diff --git a/libraries/base/GHC/IO/Encoding.hs b/libraries/base/GHC/IO/Encoding.hs
index 9d03276..e8bbdfa 100644
--- a/libraries/base/GHC/IO/Encoding.hs
+++ b/libraries/base/GHC/IO/Encoding.hs
@@ -44,11 +44,11 @@ import qualified GHC.IO.Encoding.Latin1 as Latin1
 import qualified GHC.IO.Encoding.UTF8   as UTF8
 import qualified GHC.IO.Encoding.UTF16  as UTF16
 import qualified GHC.IO.Encoding.UTF32  as UTF32
+import GHC.List
 import GHC.Word
 
 import Data.IORef
 import Data.Char (toUpper)
-import Data.List
 import System.IO.Unsafe (unsafePerformIO)
 
 -- -----------------------------------------------------------------------------
diff --git a/libraries/base/System/IO.hs b/libraries/base/System/IO.hs
index 5cd0351..cb67a2a 100644
--- a/libraries/base/System/IO.hs
+++ b/libraries/base/System/IO.hs
@@ -222,7 +222,6 @@ module System.IO (
 import Control.Exception.Base
 
 import Data.Bits
-import Data.List
 import Data.Maybe
 import Foreign.C.Error
 #ifdef mingw32_HOST_OS
@@ -233,6 +232,7 @@ import System.Posix.Internals
 import System.Posix.Types
 
 import GHC.Base
+import GHC.List
 import GHC.IO hiding ( bracket, onException )
 import GHC.IO.IOMode
 import GHC.IO.Handle.FD