Skip to content

Commit 92c3e02

Browse files
jgotohjgotoh
committed
Apply formatter
1 parent afe419d commit 92c3e02

File tree

7 files changed

+230
-208
lines changed

7 files changed

+230
-208
lines changed

‎Cabal/src/Distribution/Simple/InstallDirs.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ import Distribution.Compat.Prelude
5252
import Prelude ()
5353

5454
import Distribution.Compat.Environment (lookupEnv)
55-
import Distribution.Pretty
56-
import Distribution.Package
57-
import Distribution.Parsec
58-
import Distribution.System
5955
import Distribution.Compiler
6056
import Distribution.Package
57+
import Distribution.Parsec
6158
import Distribution.Pretty
6259
import Distribution.Simple.InstallDirs.Internal
6360
import Distribution.System

‎cabal-install/src/Distribution/Client/ProjectConfig.hs

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -747,32 +747,39 @@ readProjectFileSkeleton
747747
extensionDescription = do
748748
exists <- liftIO $ doesFileExist extensionFile
749749
if exists
750-
then do monitorFiles [monitorFileHashed extensionFile]
751-
pcs <- liftIO $ readExtensionFile verbosity extensionFile
752-
monitorFiles $ map monitorFileHashed (projectSkeletonImports pcs)
753-
pure pcs
754-
else do monitorFiles [monitorNonExistentFile extensionFile]
755-
return mempty
756-
where
757-
extensionFile = distProjectFile extensionName
758-
readExtensionFile = readAndParseFile Parsec.parseProjectSkeleton
750+
then do
751+
monitorFiles [monitorFileHashed extensionFile]
752+
pcs <- liftIO $ readExtensionFile verbosity extensionFile
753+
monitorFiles $ map monitorFileHashed (projectSkeletonImports pcs)
754+
pure pcs
755+
else do
756+
monitorFiles [monitorNonExistentFile extensionFile]
757+
return mempty
758+
where
759+
extensionFile = distProjectFile extensionName
760+
readExtensionFile = readAndParseFile Parsec.parseProjectSkeleton
759761

760762
-- | Reads a named extended (with imports and conditionals) config file in the given project root dir, or returns empty.
761-
--
762763
readProjectFileSkeletonLegacy :: Verbosity -> HttpTransport -> DistDirLayout -> String -> String -> Rebuild ProjectConfigSkeleton
763-
readProjectFileSkeletonLegacy verbosity httpTransport DistDirLayout{distProjectFile, distDownloadSrcDirectory}
764-
extensionName extensionDescription = do
764+
readProjectFileSkeletonLegacy
765+
verbosity
766+
httpTransport
767+
DistDirLayout{distProjectFile, distDownloadSrcDirectory}
768+
extensionName
769+
extensionDescription = do
765770
exists <- liftIO $ doesFileExist extensionFile
766771
if exists
767-
then do monitorFiles [monitorFileHashed extensionFile]
768-
pcs <- liftIO readExtensionFile
769-
monitorFiles $ map monitorFileHashed (projectSkeletonImports pcs)
770-
pure pcs
771-
else do monitorFiles [monitorNonExistentFile extensionFile]
772-
return mempty
773-
where
774-
extensionFile = distProjectFile extensionName
775-
readExtensionFile =
772+
then do
773+
monitorFiles [monitorFileHashed extensionFile]
774+
pcs <- liftIO readExtensionFile
775+
monitorFiles $ map monitorFileHashed (projectSkeletonImports pcs)
776+
pure pcs
777+
else do
778+
monitorFiles [monitorNonExistentFile extensionFile]
779+
return mempty
780+
where
781+
extensionFile = distProjectFile extensionName
782+
readExtensionFile =
776783
reportParseResult verbosity extensionDescription extensionFile
777784
=<< parseProjectSkeleton distDownloadSrcDirectory httpTransport verbosity [] extensionFile
778785
=<< BS.readFile extensionFile

‎cabal-install/src/Distribution/Client/ProjectConfig/FieldGrammar.hs

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,54 @@
1-
{-# LANGUAGE OverloadedStrings #-}
1+
{-# LANGUAGE OverloadedStrings #-}
2+
23
-- | 'ProjectConfig' Field descriptions
3-
module Distribution.Client.ProjectConfig.FieldGrammar (
4-
projectConfigFieldGrammar
4+
module Distribution.Client.ProjectConfig.FieldGrammar
5+
( projectConfigFieldGrammar
56
) where
67

7-
import Distribution.Compat.Prelude
88
import qualified Distribution.Client.ProjectConfig.Lens as L
99
import Distribution.Client.ProjectConfig.Types (ProjectConfig (..), ProjectConfigBuildOnly (..))
10+
import Distribution.Client.Utils.Parsec
11+
import Distribution.Compat.Prelude
1012
import Distribution.FieldGrammar
1113
import Distribution.Simple.Flag
1214
import Distribution.Types.PackageVersionConstraint (PackageVersionConstraint (..))
1315
import Distribution.Verbosity
14-
import Distribution.Client.Utils.Parsec
15-
1616

1717
projectConfigFieldGrammar :: ParsecFieldGrammar' ProjectConfig
18-
projectConfigFieldGrammar = ProjectConfig
19-
<$> monoidalFieldAla "packages" (alaList' FSep Token') L.projectPackages
20-
<*> monoidalFieldAla "optional-packages" (alaList' FSep Token') L.projectPackagesOptional
21-
<*> pure mempty -- source-repository-package stanza
22-
<*> monoidalFieldAla "extra-packages" formatPackagesNamedList L.projectPackagesNamed
23-
<*> blurFieldGrammar L.projectConfigBuildOnly projectConfigBuildOnlyFieldGrammar
24-
<*> pure mempty
25-
<*> pure mempty
26-
<*> pure mempty
27-
<*> pure mempty
28-
<*> pure mempty
18+
projectConfigFieldGrammar =
19+
ProjectConfig
20+
<$> monoidalFieldAla "packages" (alaList' FSep Token') L.projectPackages
21+
<*> monoidalFieldAla "optional-packages" (alaList' FSep Token') L.projectPackagesOptional
22+
<*> pure mempty -- source-repository-package stanza
23+
<*> monoidalFieldAla "extra-packages" formatPackagesNamedList L.projectPackagesNamed
24+
<*> blurFieldGrammar L.projectConfigBuildOnly projectConfigBuildOnlyFieldGrammar
25+
<*> pure mempty
26+
<*> pure mempty
27+
<*> pure mempty
28+
<*> pure mempty
29+
<*> pure mempty
2930

3031
formatPackagesNamedList :: [PackageVersionConstraint] -> List CommaVCat (Identity PackageVersionConstraint) PackageVersionConstraint
3132
formatPackagesNamedList = alaList CommaVCat
3233

3334
projectConfigBuildOnlyFieldGrammar :: ParsecFieldGrammar' ProjectConfigBuildOnly
34-
projectConfigBuildOnlyFieldGrammar = ProjectConfigBuildOnly
35-
<$> optionalFieldDef "verbose" L.projectConfigVerbosity (pure normal)
36-
<*> pure (toFlag False) -- cli flag: projectConfigDryRun
37-
<*> pure (toFlag False) -- cli flag: projectConfigOnlyDeps
38-
<*> pure (toFlag False) -- cli flag: projectConfigOnlyDownload
39-
<*> monoidalFieldAla "build-summary" (alaNubList VCat) L.projectConfigSummaryFile
40-
<*> undefined
41-
<*> undefined
42-
<*> undefined
43-
<*> undefined
44-
<*> undefined
45-
<*> undefined
46-
<*> undefined
47-
<*> undefined
48-
<*> undefined
49-
<*> undefined
50-
<*> undefined
51-
<*> undefined
52-
<*> undefined
53-
35+
projectConfigBuildOnlyFieldGrammar =
36+
ProjectConfigBuildOnly
37+
<$> optionalFieldDef "verbose" L.projectConfigVerbosity (pure normal)
38+
<*> pure (toFlag False) -- cli flag: projectConfigDryRun
39+
<*> pure (toFlag False) -- cli flag: projectConfigOnlyDeps
40+
<*> pure (toFlag False) -- cli flag: projectConfigOnlyDownload
41+
<*> monoidalFieldAla "build-summary" (alaNubList VCat) L.projectConfigSummaryFile
42+
<*> undefined
43+
<*> undefined
44+
<*> undefined
45+
<*> undefined
46+
<*> undefined
47+
<*> undefined
48+
<*> undefined
49+
<*> undefined
50+
<*> undefined
51+
<*> undefined
52+
<*> undefined
53+
<*> undefined
54+
<*> undefined

‎cabal-install/src/Distribution/Client/ProjectConfig/Lens.hs

Lines changed: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,83 @@
11
module Distribution.Client.ProjectConfig.Lens where
22

3-
import Distribution.Compat.Prelude
4-
import Distribution.Client.ProjectConfig.Types (ProjectConfig (..), ProjectConfigBuildOnly (..), ProjectConfigShared, ProjectConfigProvenance, PackageConfig, MapMappend)
5-
import Distribution.Compat.Lens
6-
import Distribution.Client.Types.SourceRepo (SourceRepoList)
3+
import Distribution.Client.ProjectConfig.Types (MapMappend, PackageConfig, ProjectConfig (..), ProjectConfigBuildOnly (..), ProjectConfigProvenance, ProjectConfigShared)
74
import qualified Distribution.Client.ProjectConfig.Types as T
5+
import Distribution.Client.Types.SourceRepo (SourceRepoList)
6+
import Distribution.Compat.Lens
7+
import Distribution.Compat.Prelude
88
import Distribution.Package
9-
( PackageName, PackageId, UnitId )
9+
( PackageId
10+
, PackageName
11+
, UnitId
12+
)
13+
import Distribution.Simple.InstallDirs
14+
( InstallDirs
15+
, PathTemplate
16+
)
1017
import Distribution.Simple.Setup
11-
( Flag, HaddockTarget(..), TestShowDetails(..), DumpBuildInfo (..) )
18+
( DumpBuildInfo (..)
19+
, Flag
20+
, HaddockTarget (..)
21+
, TestShowDetails (..)
22+
)
1223
import Distribution.Types.PackageVersionConstraint
13-
( PackageVersionConstraint )
14-
import Distribution.Verbosity
15-
import Distribution.Simple.InstallDirs
16-
( PathTemplate, InstallDirs )
24+
( PackageVersionConstraint
25+
)
1726
import Distribution.Utils.NubList
18-
( NubList, toNubList, fromNubList )
27+
( NubList
28+
, fromNubList
29+
, toNubList
30+
)
31+
import Distribution.Verbosity
1932

2033
projectPackages :: Lens' ProjectConfig [String]
21-
projectPackages f s = fmap (\x -> s { T.projectPackages = x }) (f (T.projectPackages s))
22-
{-# INLINABLE projectPackages #-}
34+
projectPackages f s = fmap (\x -> s{T.projectPackages = x}) (f (T.projectPackages s))
35+
{-# INLINEABLE projectPackages #-}
2336

2437
projectPackagesOptional :: Lens' ProjectConfig [String]
25-
projectPackagesOptional f s = fmap (\x -> s { T.projectPackagesOptional = x }) (f (T.projectPackagesOptional s))
26-
{-# INLINABLE projectPackagesOptional #-}
38+
projectPackagesOptional f s = fmap (\x -> s{T.projectPackagesOptional = x}) (f (T.projectPackagesOptional s))
39+
{-# INLINEABLE projectPackagesOptional #-}
2740

2841
projectPackagesRepo :: Lens' ProjectConfig [SourceRepoList]
29-
projectPackagesRepo f s = fmap (\x -> s { T.projectPackagesRepo = x }) (f (T.projectPackagesRepo s))
30-
{-# INLINABLE projectPackagesRepo #-}
42+
projectPackagesRepo f s = fmap (\x -> s{T.projectPackagesRepo = x}) (f (T.projectPackagesRepo s))
43+
{-# INLINEABLE projectPackagesRepo #-}
3144

3245
projectPackagesNamed :: Lens' ProjectConfig [PackageVersionConstraint]
33-
projectPackagesNamed f s = fmap (\x -> s { T.projectPackagesNamed = x }) (f (T.projectPackagesNamed s))
34-
{-# INLINABLE projectPackagesNamed #-}
46+
projectPackagesNamed f s = fmap (\x -> s{T.projectPackagesNamed = x}) (f (T.projectPackagesNamed s))
47+
{-# INLINEABLE projectPackagesNamed #-}
3548

3649
projectConfigBuildOnly :: Lens' ProjectConfig ProjectConfigBuildOnly
37-
projectConfigBuildOnly f s = fmap (\x -> s { T.projectConfigBuildOnly = x }) (f (T.projectConfigBuildOnly s))
38-
{-# INLINABLE projectConfigBuildOnly #-}
50+
projectConfigBuildOnly f s = fmap (\x -> s{T.projectConfigBuildOnly = x}) (f (T.projectConfigBuildOnly s))
51+
{-# INLINEABLE projectConfigBuildOnly #-}
3952

4053
projectConfigShared :: Lens' ProjectConfig ProjectConfigShared
41-
projectConfigShared f s = fmap (\x -> s { T.projectConfigShared = x }) (f (T.projectConfigShared s))
42-
{-# INLINABLE projectConfigShared #-}
54+
projectConfigShared f s = fmap (\x -> s{T.projectConfigShared = x}) (f (T.projectConfigShared s))
55+
{-# INLINEABLE projectConfigShared #-}
4356

4457
projectConfigProvenance :: Lens' ProjectConfig (Set ProjectConfigProvenance)
45-
projectConfigProvenance f s = fmap (\x -> s { T.projectConfigProvenance = x }) (f (T.projectConfigProvenance s))
46-
{-# INLINABLE projectConfigProvenance #-}
58+
projectConfigProvenance f s = fmap (\x -> s{T.projectConfigProvenance = x}) (f (T.projectConfigProvenance s))
59+
{-# INLINEABLE projectConfigProvenance #-}
4760

4861
projectConfigAllPackages :: Lens' ProjectConfig PackageConfig
49-
projectConfigAllPackages f s = fmap (\x -> s { T.projectConfigAllPackages = x }) (f (T.projectConfigAllPackages s))
50-
{-# INLINABLE projectConfigAllPackages #-}
62+
projectConfigAllPackages f s = fmap (\x -> s{T.projectConfigAllPackages = x}) (f (T.projectConfigAllPackages s))
63+
{-# INLINEABLE projectConfigAllPackages #-}
5164

5265
projectConfigLocalPackages :: Lens' ProjectConfig PackageConfig
53-
projectConfigLocalPackages f s = fmap (\x -> s { T.projectConfigLocalPackages = x }) (f (T.projectConfigLocalPackages s))
54-
{-# INLINABLE projectConfigLocalPackages #-}
66+
projectConfigLocalPackages f s = fmap (\x -> s{T.projectConfigLocalPackages = x}) (f (T.projectConfigLocalPackages s))
67+
{-# INLINEABLE projectConfigLocalPackages #-}
5568

5669
projectConfigSpecificPackage :: Lens' ProjectConfig (MapMappend PackageName PackageConfig)
57-
projectConfigSpecificPackage f s = fmap (\x -> s { T.projectConfigSpecificPackage = x }) (f (T.projectConfigSpecificPackage s))
58-
{-# INLINABLE projectConfigSpecificPackage #-}
70+
projectConfigSpecificPackage f s = fmap (\x -> s{T.projectConfigSpecificPackage = x}) (f (T.projectConfigSpecificPackage s))
71+
{-# INLINEABLE projectConfigSpecificPackage #-}
5972

6073
projectConfigVerbosity :: Lens' ProjectConfigBuildOnly (Flag Verbosity)
61-
projectConfigVerbosity f s = fmap (\x -> s { T.projectConfigVerbosity = x }) (f (T.projectConfigVerbosity s))
62-
{-# INLINABLE projectConfigVerbosity #-}
74+
projectConfigVerbosity f s = fmap (\x -> s{T.projectConfigVerbosity = x}) (f (T.projectConfigVerbosity s))
75+
{-# INLINEABLE projectConfigVerbosity #-}
6376

6477
projectConfigSummaryFile :: Lens' ProjectConfigBuildOnly (NubList PathTemplate)
65-
projectConfigSummaryFile f s = fmap (\x -> s { T.projectConfigSummaryFile = x }) (f (T.projectConfigSummaryFile s))
66-
{-# INLINABLE projectConfigSummaryFile #-}
78+
projectConfigSummaryFile f s = fmap (\x -> s{T.projectConfigSummaryFile = x}) (f (T.projectConfigSummaryFile s))
79+
{-# INLINEABLE projectConfigSummaryFile #-}
6780

6881
projectConfigSummaryFile' :: Lens' ProjectConfigBuildOnly [PathTemplate]
69-
projectConfigSummaryFile' f s = fmap (\x -> s { T.projectConfigSummaryFile = toNubList x }) (f (fromNubList $ T.projectConfigSummaryFile s))
70-
{-# INLINABLE projectConfigSummaryFile' #-}
82+
projectConfigSummaryFile' f s = fmap (\x -> s{T.projectConfigSummaryFile = toNubList x}) (f (fromNubList $ T.projectConfigSummaryFile s))
83+
{-# INLINEABLE projectConfigSummaryFile' #-}

0 commit comments

Comments
 (0)