[commit: ghc] wip/nfs-locking: Export Data.List.Extra from Base, rather than importing Extra in each module (seems to fit with the general style) (b9c6d43)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/b9c6d43718f66950024abb1212bb7fb0de1e8090/ghc

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

commit b9c6d43718f66950024abb1212bb7fb0de1e8090
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Sat Jan 9 21:47:34 2016 +0000

    Export Data.List.Extra from Base, rather than importing Extra in each module (seems to fit with the general style)


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

b9c6d43718f66950024abb1212bb7fb0de1e8090
 src/Base.hs                 | 4 ++--
 src/Oracles/LookupInPath.hs | 1 -
 src/Rules/Data.hs           | 1 -
 src/Rules/Libffi.hs         | 1 -
 src/Rules/Library.hs        | 2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Base.hs b/src/Base.hs
index 65a2d1d..a428c2c 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -3,7 +3,7 @@ module Base (
     module Control.Applicative,
     module Control.Monad.Extra,
     module Data.Function,
-    module Data.List,
+    module Data.List.Extra,
     module Data.Maybe,
     module Data.Monoid,
     MonadTrans(lift),
@@ -31,7 +31,7 @@ import Control.Applicative
 import Control.Monad.Extra
 import Control.Monad.Reader
 import Data.Function
-import Data.List
+import Data.List.Extra
 import Data.Maybe
 import Data.Monoid
 import Development.Shake hiding (unit, (*>))
diff --git a/src/Oracles/LookupInPath.hs b/src/Oracles/LookupInPath.hs
index 2532cb9..d573fd7 100644
--- a/src/Oracles/LookupInPath.hs
+++ b/src/Oracles/LookupInPath.hs
@@ -4,7 +4,6 @@ module Oracles.LookupInPath (
     ) where
 
 import Base
-import Extra (wordsBy)
 
 newtype LookupInPath = LookupInPath String
     deriving (Show, Typeable, Eq, Hashable, Binary, NFData)
diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index d6f46a6..8b21fc7 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -2,7 +2,6 @@ module Rules.Data (buildPackageData) where
 
 import Base
 import Expression
-import Extra (replace)
 import GHC
 import Oracles
 import Predicates (registerPackage)
diff --git a/src/Rules/Libffi.hs b/src/Rules/Libffi.hs
index 31f249b..9d77814 100644
--- a/src/Rules/Libffi.hs
+++ b/src/Rules/Libffi.hs
@@ -2,7 +2,6 @@ module Rules.Libffi (libffiRules, libffiDependencies) where
 
 import Base
 import Expression
-import Extra (replace)
 import GHC
 import Oracles
 import Rules.Actions
diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index 46f3971..ba20034 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -2,7 +2,7 @@ module Rules.Library (buildPackageLibrary, cSources, hSources) where
 
 import Data.Char
 
-import Base hiding (splitPath)
+import Base hiding (splitPath, split)
 import Expression
 import GHC
 import Oracles