[commit: ghc] wip/nfs-locking: Minor changes. (500ab74)

[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/500ab7440aaf5aca6a11df8c6001a963aeb30fe4/ghc

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

commit 500ab7440aaf5aca6a11df8c6001a963aeb30fe4
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Jan 5 01:03:05 2015 +0000

    Minor changes.


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

500ab7440aaf5aca6a11df8c6001a963aeb30fe4
 src/Package.hs              | 3 ++-
 src/Package/Base.hs         | 9 ++++-----
 src/Package/Data.hs         | 4 +---
 src/Package/Dependencies.hs | 4 +---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/Package.hs b/src/Package.hs
index ea7aae4..7a5f20e 100644
--- a/src/Package.hs
+++ b/src/Package.hs
@@ -4,8 +4,9 @@ import Package.Base
 import Package.Data
 import Package.Dependencies
 
--- These are the packages we build
 -- See Package.Base for definitions of basic types
+
+-- These are the packages we build:
 packages :: [Package]
 packages = [libraryPackage "deepseq" Stage1 defaultSettings]
 
diff --git a/src/Package/Base.hs b/src/Package/Base.hs
index daa5455..896bcb3 100644
--- a/src/Package/Base.hs
+++ b/src/Package/Base.hs
@@ -62,11 +62,10 @@ commonCppArgs :: Args
 commonCppArgs = mempty -- TODO: Why empty? Perhaps drop it altogether?
 
 commonCcWarninigArgs :: Args
-commonCcWarninigArgs = when Validating $ mconcat
-    [ when GccIsClang                                     $ arg "-Wno-unknown-pragmas"
-    , when (not GccIsClang && not GccLt46)                $ arg "-Wno-error=inline"
-    , when (    GccIsClang && not GccLt46 && windowsHost) $ arg "-Werror=unused-but-set-variable" 
-    ]
+commonCcWarninigArgs = when Validating $
+       when GccIsClang                                     (arg "-Wno-unknown-pragmas")
+    <> when (not GccIsClang && not GccLt46)                (arg "-Wno-error=inline")
+    <> when (    GccIsClang && not GccLt46 && windowsHost) (arg "-Werror=unused-but-set-variable" )
 
 bootPkgConstraints :: Args
 bootPkgConstraints = mempty
diff --git a/src/Package/Data.hs b/src/Package/Data.hs
index c95f8c9..fe3ec26 100644
--- a/src/Package/Data.hs
+++ b/src/Package/Data.hs
@@ -1,7 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude, ScopedTypeVariables #-}
-module Package.Data (
-    buildPackageData
-    ) where
+module Package.Data (buildPackageData) where
 
 import Package.Base
 
diff --git a/src/Package/Dependencies.hs b/src/Package/Dependencies.hs
index 99ffc34..4327ca6 100644
--- a/src/Package/Dependencies.hs
+++ b/src/Package/Dependencies.hs
@@ -1,7 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-module Package.Dependencies (
-    buildPackageDependencies
-    ) where
+module Package.Dependencies (buildPackageDependencies) where
 
 import Package.Base