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

[git at git.haskell.org]

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

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

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

commit 93bb3e0fd3cbdda74effae828ac2a9c967a45d3b
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Mon May 6 02:12:36 2013 +0200

    80-col violations.


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

93bb3e0fd3cbdda74effae828ac2a9c967a45d3b
 cabal-install/Distribution/Client/Dependency.hs |   26 ++++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/Distribution/Client/Dependency.hs
index 1c91799..493edf2 100644
--- a/cabal-install/Distribution/Client/Dependency.hs
+++ b/cabal-install/Distribution/Client/Dependency.hs
@@ -76,7 +76,8 @@ import Distribution.Package
          ( PackageName(..), PackageId, Package(..), packageVersion
          , InstalledPackageId, Dependency(Dependency))
 import Distribution.Version
-         ( Version(..), VersionRange, anyVersion, withinRange, simplifyVersionRange )
+         ( Version(..), VersionRange, anyVersion, withinRange
+         , simplifyVersionRange )
 import Distribution.Compiler
          ( CompilerId(..), CompilerFlavor(..) )
 import Distribution.System
@@ -235,7 +236,8 @@ addSourcePackages pkgs params =
     }
 
 hideInstalledPackagesSpecificByInstalledPackageId :: [InstalledPackageId]
-                                                     -> DepResolverParams -> DepResolverParams
+                                                     -> DepResolverParams
+                                                     -> DepResolverParams
 hideInstalledPackagesSpecificByInstalledPackageId pkgids params =
     --TODO: this should work using exclude constraints instead
     params {
@@ -245,7 +247,8 @@ hideInstalledPackagesSpecificByInstalledPackageId pkgids params =
     }
 
 hideInstalledPackagesSpecificBySourcePackageId :: [PackageId]
-                                                  -> DepResolverParams -> DepResolverParams
+                                                  -> DepResolverParams
+                                                  -> DepResolverParams
 hideInstalledPackagesSpecificBySourcePackageId pkgids params =
     --TODO: this should work using exclude constraints instead
     params {
@@ -353,7 +356,8 @@ resolveDependencies platform comp _solver params
 resolveDependencies platform comp  solver params =
 
     fmap (mkInstallPlan platform comp)
-  $ runSolver solver (SolverConfig reorderGoals indGoals noReinstalls shadowing maxBkjumps)
+  $ runSolver solver (SolverConfig reorderGoals indGoals noReinstalls
+                      shadowing maxBkjumps)
                      platform comp installedPkgIndex sourcePkgIndex
                      preferences constraints targets
   where
@@ -368,10 +372,10 @@ resolveDependencies platform comp  solver params =
       shadowing
       maxBkjumps      = dontUpgradeBasePackage
                       -- TODO:
-                      -- The modular solver can properly deal with broken packages
-                      -- and won't select them. So the 'hideBrokenInstalledPackages'
-                      -- function should be moved into a module that is specific
-                      -- to the Topdown solver.
+                      -- The modular solver can properly deal with broken
+                      -- packages and won't select them. So the
+                      -- 'hideBrokenInstalledPackages' function should be moved
+                      -- into a module that is specific to the Topdown solver.
                       . (if solver /= Modular then hideBrokenInstalledPackages
                                               else id)
                       $ params
@@ -448,7 +452,8 @@ resolveWithoutDependencies :: DepResolverParams
                            -> Either [ResolveNoDepsError] [SourcePackage]
 resolveWithoutDependencies (DepResolverParams targets constraints
                               prefs defpref installedPkgIndex sourcePkgIndex
-                              _reorderGoals _indGoals _avoidReinstalls _shadowing _maxBjumps) =
+                              _reorderGoals _indGoals _avoidReinstalls
+                              _shadowing _maxBjumps) =
     collectEithers (map selectPackage targets)
   where
     selectPackage :: PackageName -> Either ResolveNoDepsError SourcePackage
@@ -471,7 +476,8 @@ resolveWithoutDependencies (DepResolverParams targets constraints
                           (installPref pkg, versionPref pkg, packageVersion pkg)
         installPref   = case preferInstalled of
           PreferLatest    -> const False
-          PreferInstalled -> not . null . InstalledPackageIndex.lookupSourcePackageId
+          PreferInstalled -> not . null
+                           . InstalledPackageIndex.lookupSourcePackageId
                                                      installedPkgIndex
                            . packageId
         versionPref   pkg = packageVersion pkg `withinRange` preferredVersions