Rename module Predicates to Predicate

hadrian.cabal

@@ -36,7 +36,7 @@ executable hadrian
                        , Oracles.PackageDeps
                        , Oracles.WindowsPath
                        , Package
-                       , Predicates
+                       , Predicate
                        , Rules
                        , Rules.Actions
                        , Rules.Cabal

src/Predicates.hs → src/Predicate.hs

 {-# LANGUAGE LambdaCase, FlexibleInstances #-}
 -- | Convenient predicates
-module Predicates (
+module Predicate (
     module Expression,
     stage, stage0, stage1, stage2, notStage0,
     package, notPackage, builder, input, output, way

src/Settings/Builders/Alex.hs

 module Settings.Builders.Alex (alexBuilderArgs) where
 
-import Predicates
+import Predicate
 
 alexBuilderArgs :: Args
 alexBuilderArgs = builder Alex ? mconcat [ arg "-g"

src/Settings/Builders/Ar.hs

@@ -3,7 +3,7 @@ module Settings.Builders.Ar (arBuilderArgs, arCmd, chunksOfSize) where
 import Base
 import Oracles.Config.Flag
 import Oracles.Config.Setting
-import Predicates
+import Predicate
 
 -- | Default arguments for 'Ar' builder.
 arBuilderArgs :: Args

src/Settings/Builders/Cc.hs

@@ -3,7 +3,7 @@ module Settings.Builders.Cc (ccBuilderArgs) where
 import Base
 import Oracles.Config.Setting
 import Oracles.PackageData
-import Predicates
+import Predicate
 import Settings
 import Settings.Builders.Common
 

src/Settings/Builders/Configure.hs

@@ -2,7 +2,7 @@ module Settings.Builders.Configure (configureBuilderArgs) where
 
 import Base
 import Oracles.Config.Setting
-import Predicates
+import Predicate
 import Settings
 
 configureBuilderArgs :: Args

src/Settings/Builders/DeriveConstants.hs

@@ -3,7 +3,7 @@ module Settings.Builders.DeriveConstants (deriveConstantsBuilderArgs) where
 import Base
 import Oracles.Config.Flag
 import Oracles.Config.Setting
-import Predicates
+import Predicate
 import Settings.Builders.Common
 
 -- TODO: do we need to support `includes_CC_OPTS += -DDYNAMIC_BY_DEFAULT`?

src/Settings/Builders/GenApply.hs

 module Settings.Builders.GenApply (genApplyBuilderArgs) where
 
-import Predicates
+import Predicate
 
 -- Stdin/stdout are handled in a special way. See Rules/Actions.hs.
 -- TODO: Dead code? ifeq "$(GhcUnregisterised)" "YES" GENAPPLY_OPTS = -u

src/Settings/Builders/GenPrimopCode.hs

 module Settings.Builders.GenPrimopCode (genPrimopCodeBuilderArgs) where
 
-import Predicates
+import Predicate
 
 -- Stdin/stdout are handled in a special way. See Rules/Actions.hs.
 genPrimopCodeBuilderArgs :: Args

src/Settings/Builders/Ghc.hs

@@ -5,7 +5,7 @@ import GHC
 import Oracles.Config.Flag
 import Oracles.Config.Setting
 import Oracles.PackageData
-import Predicates hiding (way, stage)
+import Predicate hiding (way, stage)
 import Settings
 import Settings.Builders.Common
 import Settings.Builders.GhcCabal

src/Settings/Builders/GhcCabal.hs

@@ -9,7 +9,7 @@ import Builder
 import GHC
 import Oracles.Config.Flag
 import Oracles.Config.Setting
-import Predicates hiding (stage)
+import Predicate hiding (stage)
 import Settings
 import Settings.Builders.Common
 

src/Settings/Builders/GhcPkg.hs

@@ -2,7 +2,7 @@ module Settings.Builders.GhcPkg (ghcPkgBuilderArgs) where
 
 import Base
 import Builder
-import Predicates
+import Predicate
 import Settings
 import Settings.Builders.GhcCabal
 

src/Settings/Builders/Haddock.hs

@@ -4,7 +4,7 @@ import Base
 import GHC
 import Oracles.PackageData
 import Package
-import Predicates
+import Predicate
 import Settings
 import Settings.Builders.Ghc
 

src/Settings/Builders/Happy.hs

 module Settings.Builders.Happy (happyBuilderArgs) where
 
-import Predicates
+import Predicate
 
 happyBuilderArgs :: Args
 happyBuilderArgs = builder Happy ? mconcat [ arg "-agc"

src/Settings/Builders/HsCpp.hs

@@ -2,7 +2,7 @@ module Settings.Builders.HsCpp (hsCppBuilderArgs) where
 
 import GHC
 import Oracles.Config.Setting
-import Predicates
+import Predicate
 import Settings.Builders.GhcCabal
 import Settings.Paths
 

src/Settings/Builders/Hsc2Hs.hs

@@ -4,7 +4,7 @@ import Base
 import Oracles.Config.Flag
 import Oracles.Config.Setting
 import Oracles.PackageData
-import Predicates
+import Predicate
 import Settings
 import Settings.Builders.Common
 

src/Settings/Builders/Ld.hs

 module Settings.Builders.Ld (ldBuilderArgs) where
 
 import Oracles.Config.Setting
-import Predicates
+import Predicate
 
 ldBuilderArgs :: Args
 ldBuilderArgs = builder Ld ? do

src/Settings/Builders/Make.hs

 module Settings.Builders.Make (makeBuilderArgs) where
 
-import Predicates
+import Predicate
 import Settings
 
 makeBuilderArgs :: Args

src/Settings/Builders/Tar.hs

 module Settings.Builders.Tar (tarBuilderArgs) where
 
 import Base
-import Predicates
+import Predicate
 
 tarBuilderArgs :: Args
 tarBuilderArgs = builder Tar ? do

src/Settings/Default.hs

@@ -3,7 +3,7 @@ module Settings.Default (defaultSplitObjects) where
 import Base
 import GHC
 import Oracles.Config.Flag
-import Predicates
+import Predicate
 
 defaultSplitObjects :: Predicate
 defaultSplitObjects = do