Skip to content

Commit 76c82de

Browse files
committed
Consistently format import lists
1 parent 8f2d054 commit 76c82de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+639
-608
lines changed

Setup.hs

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
11
{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
22

3-
module Main (main) where
3+
module Main
4+
( main
5+
) where
46

5-
import Data.List ( nub, sortBy )
6-
import Data.Ord ( comparing )
7-
import Distribution.Package ( PackageId, UnitId, packageVersion, packageName )
8-
import Distribution.PackageDescription ( PackageDescription(), Executable(..) )
9-
import Distribution.InstalledPackageInfo (sourcePackageId, installedUnitId)
10-
import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
11-
import Distribution.Simple.Utils ( rewriteFileEx, createDirectoryIfMissingVerbose )
12-
import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
13-
import Distribution.Simple.PackageIndex (allPackages, dependencyClosure)
14-
import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), fromFlag )
15-
import Distribution.Simple.LocalBuildInfo ( installedPkgs, withLibLBI, withExeLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) )
16-
import Distribution.Types.PackageName (PackageName, unPackageName)
17-
import Distribution.Types.UnqualComponentName (unUnqualComponentName)
18-
import Distribution.Verbosity ( Verbosity, normal )
19-
import Distribution.Pretty ( prettyShow )
20-
import System.FilePath ( (</>) )
7+
import Data.List ( nub, sortBy )
8+
import Data.Ord ( comparing )
9+
import Distribution.InstalledPackageInfo
10+
( sourcePackageId, installedUnitId )
11+
import Distribution.Package
12+
( PackageId, UnitId, packageVersion, packageName )
13+
import Distribution.PackageDescription
14+
( PackageDescription (), Executable (..) )
15+
import Distribution.Pretty ( prettyShow )
16+
import Distribution.Simple
17+
( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
18+
import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
19+
import Distribution.Simple.LocalBuildInfo
20+
( installedPkgs, withLibLBI, withExeLBI, LocalBuildInfo ()
21+
, ComponentLocalBuildInfo (componentPackageDeps)
22+
)
23+
import Distribution.Simple.PackageIndex
24+
( allPackages, dependencyClosure )
25+
import Distribution.Simple.Setup
26+
( BuildFlags (buildVerbosity), fromFlag )
27+
import Distribution.Simple.Utils
28+
( rewriteFileEx, createDirectoryIfMissingVerbose )
29+
import Distribution.Types.PackageName ( PackageName, unPackageName )
30+
import Distribution.Types.UnqualComponentName
31+
( unUnqualComponentName )
32+
import Distribution.Verbosity ( Verbosity, normal )
33+
import System.FilePath ( (</>) )
2134

2235
main :: IO ()
2336
main = defaultMainWithHooks simpleUserHooks

src/Control/Concurrent/Execute.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Control.Concurrent.Execute
99
, ActionId (..)
1010
, ActionContext (..)
1111
, Action (..)
12-
, Concurrency(..)
12+
, Concurrency (..)
1313
, runActions
1414
) where
1515

src/Data/Attoparsec/Args.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-- | Parsing of Stack command line arguments
55

66
module Data.Attoparsec.Args
7-
( EscapingMode(..)
7+
( EscapingMode (..)
88
, argsParser
99
, parseArgs
1010
, parseArgsFromString

src/Data/Attoparsec/Combinators.hs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22

33
-- | More readable combinators for writing parsers.
44

5-
module Data.Attoparsec.Combinators where
5+
module Data.Attoparsec.Combinators
6+
( alternating
7+
, appending
8+
, concating
9+
, pured
10+
) where
611

7-
import Stack.Prelude
12+
import Stack.Prelude
813

914
-- | Concatenate two parsers.
1015
appending :: (Applicative f,Semigroup a)

src/Options/Applicative/Builder/Extra.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module Options.Applicative.Builder.Extra
2727
, fileCompleter
2828
, fileExtCompleter
2929
, dirCompleter
30-
, PathCompleterOpts(..)
30+
, PathCompleterOpts (..)
3131
, defaultPathCompleterOpts
3232
, pathCompleterWith
3333
, unescapeBashArg

src/Path/Extra.hs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
-- | Extra Path utilities.
55

66
module Path.Extra
7-
(toFilePathNoTrailingSep
8-
,dropRoot
9-
,parseCollapsedAbsDir
10-
,parseCollapsedAbsFile
11-
,concatAndCollapseAbsDir
12-
,rejectMissingFile
13-
,rejectMissingDir
14-
,pathToByteString
15-
,pathToLazyByteString
16-
,pathToText
17-
,tryGetModificationTime
7+
( toFilePathNoTrailingSep
8+
, dropRoot
9+
, parseCollapsedAbsDir
10+
, parseCollapsedAbsFile
11+
, concatAndCollapseAbsDir
12+
, rejectMissingFile
13+
, rejectMissingDir
14+
, pathToByteString
15+
, pathToLazyByteString
16+
, pathToText
17+
, tryGetModificationTime
1818
) where
1919

20-
import Data.Time (UTCTime)
20+
import Data.Time ( UTCTime )
2121
import Path
2222
import Path.IO
23-
import Path.Internal (Path(..))
23+
import Path.Internal ( Path (..) )
2424
import RIO
25-
import System.IO.Error (isDoesNotExistError)
25+
import System.IO.Error ( isDoesNotExistError )
2626
import qualified Data.ByteString.Char8 as BS
2727
import qualified Data.ByteString.Lazy.Char8 as BSL
2828
import qualified Data.Text as T

src/Path/Find.hs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44
-- | Finding files.
55

66
module Path.Find
7-
(findFileUp
8-
,findDirUp
9-
,findFiles
10-
,findInParents)
11-
where
7+
( findFileUp
8+
, findDirUp
9+
, findFiles
10+
, findInParents
11+
) where
1212

13-
import RIO
14-
import System.IO.Error (isPermissionError)
1513
import qualified Data.List as L
16-
import Path
17-
import Path.IO hiding (findFiles)
18-
import System.PosixCompat.Files (getSymbolicLinkStatus, isSymbolicLink)
14+
import Path
15+
import Path.IO hiding (findFiles)
16+
import RIO
17+
import System.IO.Error ( isPermissionError )
18+
import System.PosixCompat.Files
19+
( getSymbolicLinkStatus, isSymbolicLink )
1920

2021
-- | Find the location of a file matching the given predicate.
2122
findFileUp :: (MonadIO m,MonadThrow m)

src/Stack/Build.hs

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,47 @@
88
-- | Build the project.
99

1010
module Stack.Build
11-
(build
12-
,buildLocalTargets
13-
,loadPackage
14-
,mkBaseConfigOpts
15-
,queryBuildInfo
16-
,splitObjsWarning
17-
,CabalVersionException(..))
18-
where
19-
20-
import Stack.Prelude hiding (loadPackage)
21-
import Data.Aeson (Value (Object, Array), (.=), object)
11+
( build
12+
, buildLocalTargets
13+
, loadPackage
14+
, mkBaseConfigOpts
15+
, queryBuildInfo
16+
, splitObjsWarning
17+
, CabalVersionException (..)
18+
) where
19+
20+
import Data.Aeson ( Value (Object, Array), (.=), object )
2221
import qualified Data.Aeson.Key as Key
2322
import qualified Data.Aeson.KeyMap as KeyMap
24-
import Data.List ((\\), isPrefixOf)
25-
import Data.List.Extra (groupSort)
23+
import Data.List ( (\\), isPrefixOf )
24+
import Data.List.Extra ( groupSort )
2625
import qualified Data.List.NonEmpty as NE
2726
import qualified Data.Map as Map
2827
import qualified Data.Set as Set
2928
import qualified Data.Text as T
30-
import Data.Text.Encoding (decodeUtf8)
29+
import Data.Text.Encoding ( decodeUtf8 )
3130
import qualified Data.Text.IO as TIO
32-
import Data.Text.Read (decimal)
31+
import Data.Text.Read ( decimal )
3332
import qualified Data.Vector as V
3433
import qualified Data.Yaml as Yaml
3534
import qualified Distribution.PackageDescription as C
36-
import Distribution.Types.Dependency (depLibraries)
37-
import Distribution.Version (mkVersion)
38-
import Path (parent)
35+
import Distribution.Types.Dependency ( depLibraries )
36+
import Distribution.Version ( mkVersion )
37+
import Path ( parent )
3938
import Stack.Build.ConstructPlan
4039
import Stack.Build.Execute
4140
import Stack.Build.Installed
4241
import Stack.Build.Source
4342
import Stack.Package
44-
import Stack.Setup (withNewLocalBuildTargets)
43+
import Stack.Prelude hiding ( loadPackage )
44+
import Stack.Setup ( withNewLocalBuildTargets )
4545
import Stack.Types.Build
46+
import Stack.Types.Compiler ( compilerVersionText, getGhcVersion )
4647
import Stack.Types.Config
4748
import Stack.Types.NamedComponent
4849
import Stack.Types.Package
4950
import Stack.Types.SourceMap
50-
51-
import Stack.Types.Compiler (compilerVersionText, getGhcVersion)
52-
import System.Terminal (fixCodePage)
51+
import System.Terminal ( fixCodePage )
5352

5453
data CabalVersionException
5554
= AllowNewerNotSupported Version

src/Stack/Build/Cache.hs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,32 @@ module Stack.Build.Cache
3030
, writePrecompiledCache
3131
, readPrecompiledCache
3232
-- Exported for testing
33-
, BuildCache(..)
33+
, BuildCache (..)
3434
) where
3535

36-
import Stack.Prelude
37-
import Crypto.Hash (hashWith, SHA256(..))
38-
import qualified Data.ByteArray as Mem (convert)
39-
import Data.ByteString.Builder (byteString)
36+
import Crypto.Hash ( hashWith, SHA256 (..) )
37+
import qualified Data.ByteArray as Mem ( convert )
38+
import Data.ByteString.Builder ( byteString )
4039
import qualified Data.Map as M
4140
import qualified Data.Set as Set
4241
import qualified Data.Text as T
4342
import qualified Data.Yaml as Yaml
44-
import Foreign.C.Types (CTime)
43+
import Foreign.C.Types ( CTime )
4544
import Path
4645
import Path.IO
4746
import Stack.Constants
4847
import Stack.Constants.Config
48+
import Stack.Prelude
4949
import Stack.Storage.Project
5050
import Stack.Storage.User
5151
import Stack.Types.Build
5252
import Stack.Types.Cache
5353
import Stack.Types.Config
5454
import Stack.Types.GhcPkgId
5555
import Stack.Types.NamedComponent
56-
import Stack.Types.SourceMap (smRelDir)
57-
import System.PosixCompat.Files (modificationTime, getFileStatus, setFileTimes)
56+
import Stack.Types.SourceMap ( smRelDir )
57+
import System.PosixCompat.Files
58+
( modificationTime, getFileStatus, setFileTimes )
5859

5960
-- | Directory containing files to mark an executable as installed
6061
exeInstalledDir :: (HasEnvConfig env)

src/Stack/Build/Execute.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ module Stack.Build.Execute
1919
, ExecuteEnv
2020
, withExecuteEnv
2121
, withSingleContext
22-
, ExcludeTHLoading(..)
23-
, KeepOutputOpen(..)
22+
, ExcludeTHLoading (..)
23+
, KeepOutputOpen (..)
2424
) where
2525

2626
import Control.Concurrent.Execute

0 commit comments

Comments
 (0)