Clean up imports

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'.

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)
 

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

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

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

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

src/Rules/Selftest.hs

 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Rules.Selftest (selftestRules) where
 
-import Development.Shake
 import Test.QuickCheck
 
 import Base

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

src/Settings/Install.hs

 module Settings.Install (installPackageDbDirectory) where
 
-import Base
 import Expression
 import UserSettings
 

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)