[commit: packages/Cabal] ghc-head: 80-col violations. (5767dea)

git at git.haskell.org git at git.haskell.org
Mon Aug 26 23:24:30 CEST 2013


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

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=5767deab565b5944a8f46f2d3f922e84f880ca94

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

commit 5767deab565b5944a8f46f2d3f922e84f880ca94
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Sun May 5 17:50:11 2013 +0200

    80-col violations.


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

5767deab565b5944a8f46f2d3f922e84f880ca94
 Cabal/Distribution/Simple/Setup.hs |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Cabal/Distribution/Simple/Setup.hs b/Cabal/Distribution/Simple/Setup.hs
index b2ee9fa..f3ba070 100644
--- a/Cabal/Distribution/Simple/Setup.hs
+++ b/Cabal/Distribution/Simple/Setup.hs
@@ -59,7 +59,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -}
 module Distribution.Simple.Setup (
 
   GlobalFlags(..),   emptyGlobalFlags,   defaultGlobalFlags,   globalCommand,
-  ConfigFlags(..),   emptyConfigFlags,   defaultConfigFlags,   configureCommand, configAbsolutePaths,
+  ConfigFlags(..),   emptyConfigFlags,   defaultConfigFlags,   configureCommand,
+  configAbsolutePaths,
   CopyFlags(..),     emptyCopyFlags,     defaultCopyFlags,     copyCommand,
   InstallFlags(..),  emptyInstallFlags,  defaultInstallFlags,  installCommand,
   HaddockFlags(..),  emptyHaddockFlags,  defaultHaddockFlags,  haddockCommand,
@@ -102,7 +103,8 @@ import Distribution.Simple.Command hiding (boolOpt, boolOpt')
 import qualified Distribution.Simple.Command as Command
 import Distribution.Simple.Compiler
          ( CompilerFlavor(..), defaultCompilerFlavor, PackageDB(..)
-         , OptimisationLevel(..), flagToOptimisationLevel, absolutePackageDBPath )
+         , OptimisationLevel(..), flagToOptimisationLevel
+         , absolutePackageDBPath )
 import Distribution.Simple.Utils
          ( wrapLine, lowercase, intercalate )
 import Distribution.Simple.Program (Program(..), ProgramConfiguration,
@@ -308,8 +310,10 @@ data ConfigFlags = ConfigFlags {
   deriving (Read,Show)
 
 configAbsolutePaths :: ConfigFlags -> IO ConfigFlags
-configAbsolutePaths f = (\v -> f { configPackageDBs = v })
-               `liftM` mapM (maybe (return Nothing) (liftM Just . absolutePackageDBPath)) (configPackageDBs f)
+configAbsolutePaths f =
+  (\v -> f { configPackageDBs = v })
+  `liftM` mapM (maybe (return Nothing) (liftM Just . absolutePackageDBPath))
+  (configPackageDBs f)
 
 defaultConfigFlags :: ProgramConfiguration -> ConfigFlags
 defaultConfigFlags progConf = emptyConfigFlags {
@@ -1083,7 +1087,8 @@ haddockCommand = makeCommand name shortDesc longDesc defaultHaddockFlags options
     shortDesc  = "Generate Haddock HTML documentation."
     longDesc   = Just $ \_ -> "Requires the program haddock, either version 0.x or 2.x.\n"
     options showOrParseArgs =
-      [optionVerbosity haddockVerbosity (\v flags -> flags { haddockVerbosity = v })
+      [optionVerbosity haddockVerbosity
+       (\v flags -> flags { haddockVerbosity = v })
       ,optionDistPref
          haddockDistPref (\d flags -> flags { haddockDistPref = d })
          showOrParseArgs





More information about the ghc-commits mailing list