Skip to content

Commit

Permalink
Whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
23Skidoo committed Apr 19, 2016
1 parent 2f97657 commit 288334c
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions cabal-install/Distribution/Client/ProjectPlanning.hs
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ rebuildInstallPlan verbosity
projectConfigLocalPackages
(getMapMappend projectConfigSpecificPackage)
where
withRepoCtx = projectConfigWithSolverRepoContext verbosity
withRepoCtx = projectConfigWithSolverRepoContext verbosity
cabalPackageCacheDirectory
projectConfigShared
projectConfigBuildOnly
Expand Down Expand Up @@ -573,7 +573,7 @@ programsDbSignature progdb =

getInstalledPackages :: Verbosity
-> Compiler -> ProgramDb -> Platform
-> PackageDBStack
-> PackageDBStack
-> Rebuild InstalledPackageIndex
getInstalledPackages verbosity compiler progdb platform packagedbs = do
monitorFiles . map monitorFileOrDirectory
Expand Down Expand Up @@ -603,7 +603,7 @@ getSourcePackages :: Verbosity -> (forall a. (RepoContext -> IO a) -> IO a)
-> Rebuild SourcePackageDb
getSourcePackages verbosity withRepoCtx = do
(sourcePkgDb, repos) <-
liftIO $
liftIO $
withRepoCtx $ \repoctx -> do
sourcePkgDb <- IndexUtils.getSourcePackages verbosity repoctx
return (sourcePkgDb, repoContextRepos repoctx)
Expand Down Expand Up @@ -907,7 +907,7 @@ elaborateInstallPlan platform compiler compilerprogdb
pkgInstalledId
| shouldBuildInplaceOnly pkg
= mkUnitId (display pkgid ++ "-inplace")

| otherwise
= assert (isJust pkgSourceHash) $
hashedInstalledPackageId
Expand Down Expand Up @@ -1181,7 +1181,7 @@ elaboratePackageTargets ElaboratedConfiguredPackage{..} targets =
--TODO: instead of listToMaybe we should be reporting an error here
replTargets = listToMaybe
. nubComponentTargets
. map compatSubComponentTargets
. map compatSubComponentTargets
. concatMap elaborateReplTarget
$ targets
buildHaddocks = HaddockDefaultComponents `elem` targets
Expand Down Expand Up @@ -1324,7 +1324,7 @@ pruneInstallPlanPass1 perPkgTargetsMap pkgs =
-- The testsuite and benchmark targets are somewhat special in that we need
-- to configure the packages with them enabled, and we need to do that even
-- if we only want to build one of several testsuites.
--
--
-- There are two cases in which we will enable the testsuites (or
-- benchmarks): if one of the targets is a testsuite, or if all of the
-- testsuite depencencies are already cached in the store. The rationale
Expand Down Expand Up @@ -1382,7 +1382,7 @@ pruneInstallPlanPass1 perPkgTargetsMap pkgs =
| InstallPlan.PreExisting pkg <- pkgs ]

optionalStanzasWithDepsAvailable :: Set InstalledPackageId
-> ElaboratedConfiguredPackage
-> ElaboratedConfiguredPackage
-> Set OptionalStanza
optionalStanzasWithDepsAvailable availablePkgs pkg =
Set.fromList
Expand Down Expand Up @@ -1499,7 +1499,7 @@ dependencyGraph pkgid deps pkgs =
(graph, vertexToPkg', pkgidToVertex')
where
(graph, vertexToPkg, pkgidToVertex) =
Graph.graphFromEdges [ ( pkg, pkgid pkg, deps pkg )
Graph.graphFromEdges [ ( pkg, pkgid pkg, deps pkg )
| pkg <- pkgs ]
vertexToPkg' = (\(pkg,_,_) -> pkg)
. vertexToPkg
Expand Down Expand Up @@ -1605,7 +1605,7 @@ defaultSetupDeps platform pkg =
-- install-plan (as GHC8 requires Cabal-1.24+). So let's
-- set an implicit upper bound `Cabal < 2` instead.
cabalCompatMaxVer = Version [2] []

-- For other build types (like Simple) if we still need to compile an
-- external Setup.hs, it'll be one of the simple ones that only depends
-- on Cabal and base.
Expand All @@ -1614,7 +1614,7 @@ defaultSetupDeps platform pkg =
, Dependency basePkgname anyVersion ]
where
cabalConstraint = orLaterVersion (PD.specVersion pkg)

-- The internal setup wrapper method has no deps at all.
SetupNonCustomInternalLib -> Just []

Expand Down Expand Up @@ -2133,7 +2133,7 @@ packageHashConfigInputs
-- | Given the 'InstalledPackageIndex' for a nix-style package store, and an
-- 'ElaboratedInstallPlan', replace configured source packages by pre-existing
-- installed packages whenever they exist.
--
--
improveInstallPlanWithPreExistingPackages :: InstalledPackageIndex
-> ElaboratedInstallPlan
-> ElaboratedInstallPlan
Expand All @@ -2158,4 +2158,3 @@ improveInstallPlanWithPreExistingPackages installedPkgIndex installPlan =
replaceWithPreExisting =
foldl' (\plan ipkg -> InstallPlan.preexisting
(installedPackageId ipkg) ipkg plan)

0 comments on commit 288334c

Please sign in to comment.