[commit: ghc] wip/nfs-locking: Clean up. (f62f166)

[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/f62f166802cf0aa26ce72bb29b073d184897a512/ghc

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

commit f62f166802cf0aa26ce72bb29b073d184897a512
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Jul 13 16:56:48 2015 +0100

    Clean up.


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

f62f166802cf0aa26ce72bb29b073d184897a512
 src/Settings/GhcCabal.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Settings/GhcCabal.hs b/src/Settings/GhcCabal.hs
index db8fd6e..8e1a8cf 100644
--- a/src/Settings/GhcCabal.hs
+++ b/src/Settings/GhcCabal.hs
@@ -10,7 +10,7 @@ import Util
 import Package
 import Targets
 import Switches
-import Expression hiding (when, liftIO)
+import Expression hiding (liftIO)
 import Settings.Ways
 import Settings.Util
 import Settings.Packages
@@ -29,14 +29,14 @@ cabalSettings = builder GhcCabal ? do
             , argWith $ GhcPkg stage
             , stage0 ? bootPackageDbSettings
             , librarySettings
-            , configKeyNonEmpty "hscolour" ? argWith HsColour -- TODO: generalise?
+            , configKeyNonEmpty "hscolour" ? argWith HsColour
             , configureSettings
             , stage0 ? packageConstraints
             , argWith $ Gcc stage
             , notStage Stage0 ? argWith Ld
             , argWith Ar
             , argWith Alex
-            , argWith Happy ] -- TODO: reorder argWiths
+            , argWith Happy ]
 
 -- TODO: Isn't vanilla always built? If yes, some conditions are redundant.
 librarySettings :: Settings
@@ -84,9 +84,9 @@ bootPackageDbSettings = do
     sourcePath <- lift $ askConfig "ghc-source-path"
     arg $ "--package-db=" ++ sourcePath </> "libraries/bootstrapping.conf"
 
--- this is a positional argument, hence:
--- * if it is empty, we need to emit one empty string argument
--- * otherwise, we must collapse it into one space-separated string
+-- This is a positional argument, hence:
+-- * if it is empty, we need to emit one empty string argument;
+-- * otherwise, we must collapse it into one space-separated string.
 dllSettings :: Settings
 dllSettings = arg ""