[commit: ghc] wip/nfs-locking: Drop unused predicates notBuilder and builders. (af8520c)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:11:48 UTC 2017


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

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

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

commit af8520cecee4facafffe20a85da550cb06f32c58
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Jun 15 10:48:54 2015 +0100

    Drop unused predicates notBuilder and builders.


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

af8520cecee4facafffe20a85da550cb06f32c58
 src/Settings/Util.hs | 4 ++--
 src/Switches.hs      | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Settings/Util.hs b/src/Settings/Util.hs
index f73f0f7..dba49d5 100644
--- a/src/Settings/Util.hs
+++ b/src/Settings/Util.hs
@@ -51,8 +51,8 @@ appendCcArgs :: [String] -> Settings
 appendCcArgs args = do
     stage <- asks getStage
     mconcat [ builder (Gcc stage) ? append args
-            , builder GhcCabal ? appendSub "--configure-option=CFLAGS" args
-            , builder GhcCabal ? appendSub "--gcc-options" args ]
+            , builder GhcCabal    ? appendSub "--configure-option=CFLAGS" args
+            , builder GhcCabal    ? appendSub "--gcc-options" args ]
 
 -- packageData :: Arity -> String -> Settings
 -- packageData arity key =
diff --git a/src/Switches.hs b/src/Switches.hs
index 0433682..eada97c 100644
--- a/src/Switches.hs
+++ b/src/Switches.hs
@@ -1,6 +1,6 @@
 module Switches (
     IntegerLibraryImpl (..), integerLibraryImpl,
-    notStage, stage0, stage1, stage2, builders, notBuilder,
+    notStage, stage0, stage1, stage2,
     supportsPackageKey, targetPlatforms, targetPlatform,
     targetOss, targetOs, notTargetOs,
     targetArchs, dynamicGhcPrograms, ghcWithInterpreter,
@@ -9,7 +9,6 @@ module Switches (
     ) where
 
 import Base
-import Oracles.Builder
 import Expression
 
 -- Support for multiple integer library implementations
@@ -31,12 +30,6 @@ stage1 = stage Stage1
 stage2 :: Predicate
 stage2 = stage Stage2
 
-builders :: [Builder] -> Predicate
-builders = liftM or . sequence . map builder
-
-notBuilder :: Builder -> Predicate
-notBuilder = liftM not . builder
-
 -- Predicates based on configuration files
 supportsPackageKey :: Predicate
 supportsPackageKey = configKeyYes "supports-package-key"



More information about the ghc-commits mailing list