[commit: ghc] wip/nfs-locking: Clean up imports (0ef2b1f)

[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/0ef2b1f8123ba90614c24d06a0a32bda0410334e/ghc

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

commit 0ef2b1f8123ba90614c24d06a0a32bda0410334e
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Aug 14 00:05:10 2017 +0100

    Clean up imports


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

0ef2b1f8123ba90614c24d06a0a32bda0410334e
 src/Expression.hs           | 14 ++------------
 src/Hadrian/Oracles/Path.hs |  1 -
 src/Oracles/PackageData.hs  |  5 ++---
 src/Oracles/Setting.hs      |  1 -
 src/Rules.hs                |  1 -
 src/Rules/Install.hs        |  2 +-
 src/Rules/Selftest.hs       |  1 -
 src/Settings.hs             |  1 -
 src/Settings/Install.hs     |  1 -
 src/Utilities.hs            |  1 -
 10 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/Expression.hs b/src/Expression.hs
index 34a88fb..ca8862e 100644
--- a/src/Expression.hs
+++ b/src/Expression.hs
@@ -20,25 +20,15 @@ module Expression (
     getInput, getOutput,
 
     -- * Re-exports
-    module Data.Semigroup,
-    module Builder,
-    module Package,
-    module Stage,
-    module Way
+    module Base
     ) where
 
-import Control.Monad.Extra
-import Data.Semigroup
-
 import qualified Hadrian.Expression as H
 import Hadrian.Expression hiding (Expr, Predicate, Args)
 
-import Builder
+import Base
 import Context (Context, vanillaContext, stageContext, getStage, getPackage, getWay)
-import Package
-import Stage
 import Target hiding (builder, inputs, outputs)
-import Way
 
 -- | @Expr a@ is a computation that produces a value of type @Action a@ and can
 -- read parameters of the current build 'Target'.
diff --git a/src/Hadrian/Oracles/Path.hs b/src/Hadrian/Oracles/Path.hs
index 2c578a1..d10948b 100644
--- a/src/Hadrian/Oracles/Path.hs
+++ b/src/Hadrian/Oracles/Path.hs
@@ -33,7 +33,6 @@ fixAbsolutePathOnWindows path = do
     else
         return path
 
-
 newtype LookupInPath = LookupInPath String
     deriving (Binary, Eq, Hashable, NFData, Show, Typeable)
 
diff --git a/src/Oracles/PackageData.hs b/src/Oracles/PackageData.hs
index c813f82..208881d 100644
--- a/src/Oracles/PackageData.hs
+++ b/src/Oracles/PackageData.hs
@@ -2,10 +2,9 @@ module Oracles.PackageData (
     PackageData (..), PackageDataList (..), pkgData, pkgDataList
     ) where
 
-import Data.List
-import Development.Shake
 import Hadrian.Oracles.KeyValue
-import Hadrian.Utilities
+
+import Base
 
 data PackageData = BuildGhciLib FilePath
                  | ComponentId  FilePath
diff --git a/src/Oracles/Setting.hs b/src/Oracles/Setting.hs
index 095dbaa..e9fe886 100644
--- a/src/Oracles/Setting.hs
+++ b/src/Oracles/Setting.hs
@@ -6,7 +6,6 @@ module Oracles.Setting (
     topDirectory, relocatableBuild, installDocDir, installGhcLibDir, libsuf
     ) where
 
-import Development.Shake
 import Hadrian.Expression
 import Hadrian.Oracles.KeyValue
 import Hadrian.Oracles.Path
diff --git a/src/Rules.hs b/src/Rules.hs
index 8a576d4..149789f 100644
--- a/src/Rules.hs
+++ b/src/Rules.hs
@@ -5,7 +5,6 @@ import qualified Hadrian.Oracles.DirectoryContents
 import qualified Hadrian.Oracles.KeyValue
 import qualified Hadrian.Oracles.Path
 
-import Base
 import Context
 import Expression
 import Flavour
diff --git a/src/Rules/Install.hs b/src/Rules/Install.hs
index edf2492..4b24ca2 100644
--- a/src/Rules/Install.hs
+++ b/src/Rules/Install.hs
@@ -5,7 +5,7 @@ import qualified System.Directory as IO
 
 import Base
 import Context
-import Expression hiding (builder)
+import Expression
 import GHC
 import Oracles.Setting
 import Rules
diff --git a/src/Rules/Selftest.hs b/src/Rules/Selftest.hs
index 0112d8f..3942753 100644
--- a/src/Rules/Selftest.hs
+++ b/src/Rules/Selftest.hs
@@ -1,7 +1,6 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Rules.Selftest (selftestRules) where
 
-import Development.Shake
 import Test.QuickCheck
 
 import Base
diff --git a/src/Settings.hs b/src/Settings.hs
index 7576e7a..e285175 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -9,7 +9,6 @@ module Settings (
 import Hadrian.Oracles.KeyValue
 import Hadrian.Oracles.Path
 
-import Base
 import Context
 import CmdLineFlag
 import Expression
diff --git a/src/Settings/Install.hs b/src/Settings/Install.hs
index 2d18a67..086cfa2 100644
--- a/src/Settings/Install.hs
+++ b/src/Settings/Install.hs
@@ -1,6 +1,5 @@
 module Settings.Install (installPackageDbDirectory) where
 
-import Base
 import Expression
 import UserSettings
 
diff --git a/src/Utilities.hs b/src/Utilities.hs
index 5356c11..07b34be 100644
--- a/src/Utilities.hs
+++ b/src/Utilities.hs
@@ -17,7 +17,6 @@ import Hadrian.Oracles.DirectoryContents
 import Hadrian.Oracles.KeyValue
 import Hadrian.Oracles.Path
 
-import Base
 import CmdLineFlag
 import Context
 import Expression hiding (builder, inputs, outputs, way, stage, package)