[commit: ghc] wip/nfs-locking: Eliminate re-exports from `Predicates` (74fb3f9)

[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/74fb3f9e869300335ba2b8ed831b792a64696877/ghc

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

commit 74fb3f9e869300335ba2b8ed831b792a64696877
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 24 14:31:07 2015 +0100

    Eliminate re-exports from `Predicates`


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

74fb3f9e869300335ba2b8ed831b792a64696877
 src/Predicates.hs                | 5 +----
 src/Rules/Library.hs             | 4 ++--
 src/Settings/Builders/Haddock.hs | 1 +
 src/Settings/Packages.hs         | 2 ++
 src/Settings/User.hs             | 2 +-
 src/Settings/Ways.hs             | 1 +
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Predicates.hs b/src/Predicates.hs
index abaa4be..28dd51a 100644
--- a/src/Predicates.hs
+++ b/src/Predicates.hs
@@ -1,7 +1,5 @@
+-- | Convenient predicates
 module Predicates (
-    module GHC,
-    module Oracles.Config.Flag,
-    module Oracles.Config.Setting,
     stage, package, builder, stagedBuilder, file, way,
     stage0, stage1, stage2, notStage0, notPackage, registerPackage, splitObjects
     ) where
@@ -10,7 +8,6 @@ import Base
 import Expression
 import GHC
 import Oracles.Config.Flag
-import Oracles.Config.Setting
 
 -- Basic predicates
 stage :: Stage -> Predicate
diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index eeef3ab..76fe872 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -2,8 +2,8 @@ module Rules.Library (buildPackageLibrary, cSources, hSources) where
 
 import Data.Char
 
-import Base
-import Expression hiding (splitPath)
+import Base hiding (splitPath)
+import Expression
 import GHC
 import Oracles
 import Predicates (splitObjects)
diff --git a/src/Settings/Builders/Haddock.hs b/src/Settings/Builders/Haddock.hs
index ead473e..c8226fc 100644
--- a/src/Settings/Builders/Haddock.hs
+++ b/src/Settings/Builders/Haddock.hs
@@ -2,6 +2,7 @@ module Settings.Builders.Haddock (haddockArgs) where
 
 import Development.Shake.FilePath
 import Base
+import GHC
 import Package
 import Expression
 import Oracles
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index cd856b8..61457cb 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -2,7 +2,9 @@ module Settings.Packages (getPackages, knownPackages, findKnownPackage) where
 
 import Base
 import Expression
+import GHC
 import Predicates
+import Oracles.Config.Setting
 import Settings.User
 
 -- Combining default list of packages with user modifications
diff --git a/src/Settings/User.hs b/src/Settings/User.hs
index e16fb27..cad2578 100644
--- a/src/Settings/User.hs
+++ b/src/Settings/User.hs
@@ -6,8 +6,8 @@ module Settings.User (
     verboseCommands, turnWarningsIntoErrors
     ) where
 
+import GHC
 import Expression
-import Predicates
 
 -- No user-specific settings by default
 -- TODO: rename to userArgs
diff --git a/src/Settings/Ways.hs b/src/Settings/Ways.hs
index 8484575..8376213 100644
--- a/src/Settings/Ways.hs
+++ b/src/Settings/Ways.hs
@@ -4,6 +4,7 @@ import Data.Monoid
 import Expression
 import Predicates
 import Settings.User
+import Oracles.Config.Flag
 
 -- TODO: use a single expression Ways parameterised by package instead of
 -- expressions libWays and rtsWays