[commit: ghc] wip/nfs-locking: Minor tweaks (5b49f64)

[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/5b49f649a2f4b9a4fcb0ea6a46f5a40480ee0375/ghc

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

commit 5b49f649a2f4b9a4fcb0ea6a46f5a40480ee0375
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Apr 12 01:04:31 2016 +0100

    Minor tweaks


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

5b49f649a2f4b9a4fcb0ea6a46f5a40480ee0375
 src/Predicates.hs                 | 4 +---
 src/Settings/Builders/Common.hs   | 6 +++---
 src/Settings/Builders/GhcCabal.hs | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Predicates.hs b/src/Predicates.hs
index c0f6095..1c5ce38 100644
--- a/src/Predicates.hs
+++ b/src/Predicates.hs
@@ -21,9 +21,7 @@ builder b = (b ==) <$> getBuilder
 
 -- | Is a certain builder used in the current stage?
 stagedBuilder :: (Stage -> Builder) -> Predicate
-stagedBuilder stageBuilder = do
-    s <- getStage
-    builder (stageBuilder s)
+stagedBuilder stageBuilder = builder . stageBuilder =<< getStage
 
 -- | Are we building with GCC?
 builderGcc :: Predicate
diff --git a/src/Settings/Builders/Common.hs b/src/Settings/Builders/Common.hs
index 4ecf1d4..1f1d33b 100644
--- a/src/Settings/Builders/Common.hs
+++ b/src/Settings/Builders/Common.hs
@@ -51,10 +51,10 @@ argSetting :: Setting -> Args
 argSetting = argM . setting
 
 argSettingList :: SettingList -> Args
-argSettingList = (append =<<) . lift . settingList
+argSettingList = (append =<<) . getSettingList
 
 argStagedSettingList :: (Stage -> SettingList) -> Args
-argStagedSettingList ss = (argSettingList . ss) =<< getStage
+argStagedSettingList ss = argSettingList . ss =<< getStage
 
 argStagedBuilderPath :: (Stage -> Builder) -> Args
-argStagedBuilderPath sb = (argM . builderPath . sb) =<< getStage
+argStagedBuilderPath sb = argM . builderPath . sb =<< getStage
diff --git a/src/Settings/Builders/GhcCabal.hs b/src/Settings/Builders/GhcCabal.hs
index be89546..24b7d7d 100644
--- a/src/Settings/Builders/GhcCabal.hs
+++ b/src/Settings/Builders/GhcCabal.hs
@@ -131,7 +131,7 @@ with b = specified b ? do
     append [withBuilderKey b ++ top -/- path]
 
 withStaged :: (Stage -> Builder) -> Args
-withStaged sb = (with . sb) =<< getStage
+withStaged sb = with . sb =<< getStage
 
 needDll0 :: Stage -> Package -> Action Bool
 needDll0 stage pkg = do