Skip to content

Commit 6b9c481

Browse files
alt-romesalt-romes
committed
(Fourmolu formatting)
1 parent 697a6a8 commit 6b9c481

File tree

13 files changed

+84
-74
lines changed

13 files changed

+84
-74
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ mergeListFlag :: Flag [a] -> Flag [a] -> Flag [a]
149149
mergeListFlag currentFlags v =
150150
Flag $ concat (flagToList currentFlags ++ flagToList v)
151151

152-
153152
-- | Types that represent boolean flags.
154153
class BooleanFlag a where
155154
asBool :: a -> Bool

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-# LANGUAGE FlexibleContexts #-}
2-
{-# LANGUAGE RankNTypes #-}
32
{-# LANGUAGE NamedFieldPuns #-}
3+
{-# LANGUAGE RankNTypes #-}
44

55
-----------------------------------------------------------------------------
66

@@ -35,20 +35,20 @@ import Distribution.PackageDescription
3535
)
3636
import qualified Distribution.PackageDescription as PD
3737
import Distribution.Pretty
38+
import Distribution.Simple.Flag (fromFlagOrDefault)
3839
import Distribution.Simple.LocalBuildInfo (LocalBuildInfo (..))
3940
import Distribution.Simple.Program
4041
( hpcProgram
4142
, requireProgramVersion
4243
)
4344
import Distribution.Simple.Program.Hpc (markup, union)
45+
import Distribution.Simple.Setup (TestFlags (..))
4446
import Distribution.Simple.Utils (notice)
4547
import Distribution.Types.UnqualComponentName
4648
import Distribution.Verbosity (Verbosity ())
4749
import Distribution.Version (anyVersion)
4850
import System.Directory (createDirectoryIfMissing, doesFileExist)
4951
import System.FilePath
50-
import Distribution.Simple.Setup (TestFlags(..))
51-
import Distribution.Simple.Flag (fromFlagOrDefault)
5252

5353
-- -------------------------------------------------------------------------
5454
-- Haskell Program Coverage
@@ -152,14 +152,14 @@ markupPackage verbosity TestFlags{testCoverageDistPrefs, testCoverageLibsModules
152152
tixFilePath testDistPref way testName'
153153
-- And call 'markupPackage' once per `test` invocation with all the
154154
-- testsuites to run, which results in multiple tix files being considered
155-
_ -> do
155+
_ -> do
156156
let excluded = concatMap testModules suites ++ [main]
157157
pkgName = prettyShow $ PD.package pkg_descr
158158
summedTixFile = tixFilePath testDistPref way pkgName
159159
createDirectoryIfMissing True $ takeDirectory summedTixFile
160160
union hpc verbosity tixFiles summedTixFile excluded
161161
return summedTixFile
162-
162+
163163
markup hpc hpcVer verbosity tixFile mixDirs htmlDir' included
164164
notice verbosity $
165165
"Package coverage report written to "
@@ -170,4 +170,3 @@ markupPackage verbosity TestFlags{testCoverageDistPrefs, testCoverageLibsModules
170170
testNames = fmap (unUnqualComponentName . testName) suites
171171
mixDirs = map (`mixDir` way) (fromFlagOrDefault [] testCoverageDistPrefs)
172172
included = fromFlagOrDefault [] testCoverageLibsModules
173-

‎Cabal/src/Distribution/Simple/Setup/Test.hs

+31-30
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import Distribution.Simple.Utils
4040
import Distribution.Verbosity
4141
import qualified Text.PrettyPrint as Disp
4242

43-
import Distribution.Simple.Setup.Common
4443
import Distribution.ModuleName (ModuleName)
44+
import Distribution.Simple.Setup.Common
4545

4646
-- ------------------------------------------------------------
4747

@@ -98,7 +98,6 @@ data TestFlags = TestFlags
9898
-- excludes indefinite libraries and instantiations because HPC does not
9999
-- support backpack - Nov. 2023). Cabal uses these paths as dist prefixes to
100100
-- determine the path to the `mix` dirs of each component to cover.
101-
102101
, -- TODO: think about if/how options are passed to test exes
103102
testOptions :: [PathTemplate]
104103
}
@@ -223,35 +222,37 @@ testOptions' showOrParseArgs =
223222
(\v flags -> flags{testFailWhenNoTestSuites = v})
224223
trueArg
225224
, option
226-
[]
227-
["coverage-module"]
228-
"Module of a project-local library to include in the HPC report"
229-
testCoverageLibsModules
230-
(\v flags ->
231-
flags{ testCoverageLibsModules =
232-
mergeListFlag (testCoverageLibsModules flags) v
233-
}
234-
)
235-
( reqArg'
236-
"MODULE"
237-
(Flag . (: []) . fromString)
238-
(fmap prettyShow . fromFlagOrDefault [])
239-
)
225+
[]
226+
["coverage-module"]
227+
"Module of a project-local library to include in the HPC report"
228+
testCoverageLibsModules
229+
( \v flags ->
230+
flags
231+
{ testCoverageLibsModules =
232+
mergeListFlag (testCoverageLibsModules flags) v
233+
}
234+
)
235+
( reqArg'
236+
"MODULE"
237+
(Flag . (: []) . fromString)
238+
(fmap prettyShow . fromFlagOrDefault [])
239+
)
240240
, option
241-
[]
242-
["coverage-dist-dir"]
243-
"The directory where Cabal puts generated build files of an HPC enabled component"
244-
testCoverageDistPrefs
245-
(\v flags ->
246-
flags{ testCoverageDistPrefs =
247-
mergeListFlag (testCoverageDistPrefs flags) v
248-
}
249-
)
250-
( reqArg'
251-
"DIR"
252-
(Flag . (: []))
253-
(fromFlagOrDefault [])
254-
)
241+
[]
242+
["coverage-dist-dir"]
243+
"The directory where Cabal puts generated build files of an HPC enabled component"
244+
testCoverageDistPrefs
245+
( \v flags ->
246+
flags
247+
{ testCoverageDistPrefs =
248+
mergeListFlag (testCoverageDistPrefs flags) v
249+
}
250+
)
251+
( reqArg'
252+
"DIR"
253+
(Flag . (: []))
254+
(fromFlagOrDefault [])
255+
)
255256
, option
256257
[]
257258
["test-options"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ unpackPackageTarball verbosity tarball parentdir pkgid pkgTextOverride =
10991099
parentdir
11001100
</> pkgsubdir
11011101
</> prettyShow pkgname
1102-
<.> "cabal"
1102+
<.> "cabal"
11031103
pkgsubdir = prettyShow pkgid
11041104
pkgname = packageName pkgid
11051105

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

+18-14
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
{-# LANGUAGE RecordWildCards #-}
88
{-# LANGUAGE TypeFamilies #-}
99
{-# LANGUAGE ViewPatterns #-}
10-
{-# LANGUAGE NoMonoLocalBinds #-} -- MUST come after TypeFamilies because TypeFamilies imply MonoLocalBinds
10+
-- MUST come after TypeFamilies because TypeFamilies imply MonoLocalBinds
11+
{-# LANGUAGE NoMonoLocalBinds #-}
1112

1213
-- | Planning how to build everything in a project.
1314
module Distribution.Client.ProjectPlanning
@@ -148,10 +149,11 @@ import Distribution.Simple.Program.Db
148149
import Distribution.Simple.Program.Find
149150
import Distribution.Simple.Setup
150151
( Flag (..)
152+
, TestFlags (testCoverageDistPrefs)
151153
, flagToList
152154
, flagToMaybe
153155
, fromFlagOrDefault
154-
, toFlag, TestFlags (testCoverageDistPrefs)
156+
, toFlag
155157
)
156158
import qualified Distribution.Simple.Setup as Cabal
157159
import Distribution.System
@@ -1724,7 +1726,7 @@ elaborateInstallPlan
17241726
dieProgress $
17251727
text "Internal libraries only supported with per-component builds."
17261728
$$ text "Per-component builds were disabled because"
1727-
<+> fsep (punctuate comma reasons)
1729+
<+> fsep (punctuate comma reasons)
17281730
-- TODO: Maybe exclude Backpack too
17291731

17301732
elab0 = elaborateSolverToCommon spkg
@@ -4306,7 +4308,7 @@ setupHsTestFlags plan (ElaboratedConfiguredPackage{..}) sharedConfig verbosity d
43064308
covLibsDistPref = map (distBuildDirectory distDirLayout . elabDistDirParams sharedConfig) librariesToCover
43074309
-- The list of modules from libraries to consider in hpc, that Cabal passes to the hpc markup call
43084310
-- This list includes all modules, not only the exposed ones.
4309-
covIncludeModules = concatMap (\ElaboratedConfiguredPackage{elabModuleShape=modShape} -> Map.keys $ modShapeProvides modShape) librariesToCover
4311+
covIncludeModules = concatMap (\ElaboratedConfiguredPackage{elabModuleShape = modShape} -> Map.keys $ modShapeProvides modShape) librariesToCover
43104312

43114313
-- The list of non-pre-existing libraries without module holes, i.e. the
43124314
-- main library and sub-libraries components of all the local packages in
@@ -4316,18 +4318,21 @@ setupHsTestFlags plan (ElaboratedConfiguredPackage{..}) sharedConfig verbosity d
43164318
-- this seemingly includes the packages that are not local to the project?!
43174319
-- Weird, because we filter on localToProject!
43184320
-- Try it on cabal-install: cabal test --enable-coverage cabal-install
4319-
librariesToCover
4320-
= mapMaybe (\case
4321-
InstallPlan.Installed elab@ElaboratedConfiguredPackage{elabModuleShape=modShape}
4321+
librariesToCover =
4322+
mapMaybe
4323+
( \case
4324+
InstallPlan.Installed elab@ElaboratedConfiguredPackage{elabModuleShape = modShape}
43224325
| elabLocalToProject
4323-
, not (isIndefiniteOrInstantiation modShape)
4324-
-> Just elab
4325-
InstallPlan.Configured elab@ElaboratedConfiguredPackage{elabModuleShape=modShape}
4326+
, not (isIndefiniteOrInstantiation modShape) ->
4327+
Just elab
4328+
InstallPlan.Configured elab@ElaboratedConfiguredPackage{elabModuleShape = modShape}
43264329
| elabLocalToProject
4327-
, not (isIndefiniteOrInstantiation modShape)
4328-
-> Just elab
4330+
, not (isIndefiniteOrInstantiation modShape) ->
4331+
Just elab
43294332
_ -> Nothing
4330-
) $ Graph.toList $ InstallPlan.toGraph plan
4333+
)
4334+
$ Graph.toList
4335+
$ InstallPlan.toGraph plan
43314336

43324337
isIndefiniteOrInstantiation :: ModuleShape -> Bool
43334338
isIndefiniteOrInstantiation = not . Set.null . modShapeRequires
@@ -4465,7 +4470,6 @@ setupHsHaddockArgs :: ElaboratedConfiguredPackage -> [String]
44654470
setupHsHaddockArgs elab =
44664471
map (showComponentTarget (packageId elab)) (elabHaddockTargets elab)
44674472

4468-
44694473
------------------------------------------------------------------------------
44704474

44714475
-- * Sharing installed packages

‎cabal-testsuite/PackageTests/Backpack/Includes2/enable-coverage.test.hs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Test.Cabal.Prelude
2+
23
main = cabalTest $ do
3-
skipUnlessGhcVersion ">= 8.1"
4-
-- #6397
5-
cabal "test" ["--enable-coverage"]
4+
skipUnlessGhcVersion ">= 8.1"
5+
-- #6397
6+
cabal "test" ["--enable-coverage"]

‎cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.test.hs

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import Test.Cabal.Prelude
2-
main = cabalTest $
3-
cabal' "v2-run" ["pkg-abc:program"] >>= assertOutputContains "pkg-def:publib"
4-
5-
-- # #8609
6-
cabal' "v2-test" ["--enable-coverage", "all"]
72

3+
main =
4+
cabalTest $
5+
cabal' "v2-run" ["pkg-abc:program"]
6+
>>= assertOutputContains
7+
"pkg-def:publib"
8+
-- # #8609
9+
cabal'
10+
"v2-test"
11+
["--enable-coverage", "all"]

‎cabal-testsuite/PackageTests/Regression/T4798/cabal.test.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import Test.Cabal.Prelude
2-
main = cabalTest $ cabal "test" ["--enable-coverage"]
32

3+
main = cabalTest $ cabal "test" ["--enable-coverage"]

‎cabal-testsuite/PackageTests/Regression/T4798/src/U2F/Types.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module U2F.Types where
22

3-
data Curve = SEC_p256r1 deriving Show
3+
data Curve = SEC_p256r1 deriving (Show)

‎cabal-testsuite/PackageTests/Regression/T4798/tests/test.hs

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ import U2F.Types
33

44
main = print ourCurve
55
main :: IO ()
6-

‎cabal-testsuite/PackageTests/Regression/T6440/cabal.test.hs

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
import Test.Cabal.Prelude
2+
23
main = cabalTest $ cabal "test" ["--enable-coverage"]

‎cabal-testsuite/PackageTests/Regression/T6440/src/Top.hs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module Top where
2+
23
import Inn
34

45
foo :: String

‎cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/setup-no-markup.test.hs

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import Test.Cabal.Prelude
21
import Distribution.Simple.Hpc
2+
import Test.Cabal.Prelude
33

44
-- Ensures that even if a .tix file happens to be left around
55
-- markup isn't generated.
66
main = setupAndCabalTest $ do
7-
dist_dir <- fmap testDistDir getTestEnv
8-
let tixFile = tixFilePath dist_dir Vanilla "test-Short"
9-
withEnv [("HPCTIXFILE", Just tixFile)] $ do
10-
setup_build
11-
[ "--enable-tests"
12-
, "--ghc-option=-fhpc"
13-
, "--ghc-option=-hpcdir"
14-
, "--ghc-option=" ++ dist_dir ++ "/hpc/vanilla" ]
15-
setup "test" ["test-Short", "--show-details=direct"]
16-
shouldNotExist $ htmlDir dist_dir Vanilla </> "hpc_index.html"
7+
dist_dir <- fmap testDistDir getTestEnv
8+
let tixFile = tixFilePath dist_dir Vanilla "test-Short"
9+
withEnv [("HPCTIXFILE", Just tixFile)] $ do
10+
setup_build
11+
[ "--enable-tests"
12+
, "--ghc-option=-fhpc"
13+
, "--ghc-option=-hpcdir"
14+
, "--ghc-option=" ++ dist_dir ++ "/hpc/vanilla"
15+
]
16+
setup "test" ["test-Short", "--show-details=direct"]
17+
shouldNotExist $ htmlDir dist_dir Vanilla </> "hpc_index.html"

0 commit comments

Comments
 (0)