diff --git a/Setup.hs b/Setup.hs index 9fc5e15a26..4297563c31 100644 --- a/Setup.hs +++ b/Setup.hs @@ -1,23 +1,36 @@ {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} -module Main (main) where +module Main + ( main + ) where -import Data.List ( nub, sortBy ) -import Data.Ord ( comparing ) -import Distribution.Package ( PackageId, UnitId, packageVersion, packageName ) -import Distribution.PackageDescription ( PackageDescription(), Executable(..) ) -import Distribution.InstalledPackageInfo (sourcePackageId, installedUnitId) -import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks ) -import Distribution.Simple.Utils ( rewriteFileEx, createDirectoryIfMissingVerbose ) -import Distribution.Simple.BuildPaths ( autogenPackageModulesDir ) -import Distribution.Simple.PackageIndex (allPackages, dependencyClosure) -import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), fromFlag ) -import Distribution.Simple.LocalBuildInfo ( installedPkgs, withLibLBI, withExeLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) ) -import Distribution.Types.PackageName (PackageName, unPackageName) -import Distribution.Types.UnqualComponentName (unUnqualComponentName) -import Distribution.Verbosity ( Verbosity, normal ) -import Distribution.Pretty ( prettyShow ) -import System.FilePath ( () ) +import Data.List ( nub, sortBy ) +import Data.Ord ( comparing ) +import Distribution.InstalledPackageInfo + ( sourcePackageId, installedUnitId ) +import Distribution.Package + ( PackageId, UnitId, packageVersion, packageName ) +import Distribution.PackageDescription + ( PackageDescription (), Executable (..) ) +import Distribution.Pretty ( prettyShow ) +import Distribution.Simple + ( defaultMainWithHooks, UserHooks(..), simpleUserHooks ) +import Distribution.Simple.BuildPaths ( autogenPackageModulesDir ) +import Distribution.Simple.LocalBuildInfo + ( installedPkgs, withLibLBI, withExeLBI, LocalBuildInfo () + , ComponentLocalBuildInfo (componentPackageDeps) + ) +import Distribution.Simple.PackageIndex + ( allPackages, dependencyClosure ) +import Distribution.Simple.Setup + ( BuildFlags (buildVerbosity), fromFlag ) +import Distribution.Simple.Utils + ( rewriteFileEx, createDirectoryIfMissingVerbose ) +import Distribution.Types.PackageName ( PackageName, unPackageName ) +import Distribution.Types.UnqualComponentName + ( unUnqualComponentName ) +import Distribution.Verbosity ( Verbosity, normal ) +import System.FilePath ( () ) main :: IO () main = defaultMainWithHooks simpleUserHooks diff --git a/src/Control/Concurrent/Execute.hs b/src/Control/Concurrent/Execute.hs index 202aeae120..cd3e108790 100644 --- a/src/Control/Concurrent/Execute.hs +++ b/src/Control/Concurrent/Execute.hs @@ -9,7 +9,7 @@ module Control.Concurrent.Execute , ActionId (..) , ActionContext (..) , Action (..) - , Concurrency(..) + , Concurrency (..) , runActions ) where diff --git a/src/Data/Attoparsec/Args.hs b/src/Data/Attoparsec/Args.hs index 3191909de5..2d7e5adc25 100644 --- a/src/Data/Attoparsec/Args.hs +++ b/src/Data/Attoparsec/Args.hs @@ -4,7 +4,7 @@ -- | Parsing of Stack command line arguments module Data.Attoparsec.Args - ( EscapingMode(..) + ( EscapingMode (..) , argsParser , parseArgs , parseArgsFromString diff --git a/src/Data/Attoparsec/Combinators.hs b/src/Data/Attoparsec/Combinators.hs index a377e2b0be..6c0efc90f0 100644 --- a/src/Data/Attoparsec/Combinators.hs +++ b/src/Data/Attoparsec/Combinators.hs @@ -2,9 +2,14 @@ -- | More readable combinators for writing parsers. -module Data.Attoparsec.Combinators where +module Data.Attoparsec.Combinators + ( alternating + , appending + , concating + , pured + ) where -import Stack.Prelude +import Stack.Prelude -- | Concatenate two parsers. appending :: (Applicative f,Semigroup a) diff --git a/src/Options/Applicative/Builder/Extra.hs b/src/Options/Applicative/Builder/Extra.hs index 9d870815d7..28cbc187bd 100644 --- a/src/Options/Applicative/Builder/Extra.hs +++ b/src/Options/Applicative/Builder/Extra.hs @@ -27,7 +27,7 @@ module Options.Applicative.Builder.Extra , fileCompleter , fileExtCompleter , dirCompleter - , PathCompleterOpts(..) + , PathCompleterOpts (..) , defaultPathCompleterOpts , pathCompleterWith , unescapeBashArg diff --git a/src/Path/Extra.hs b/src/Path/Extra.hs index d7ebf673a8..c3a1689279 100644 --- a/src/Path/Extra.hs +++ b/src/Path/Extra.hs @@ -4,25 +4,25 @@ -- | Extra Path utilities. module Path.Extra - (toFilePathNoTrailingSep - ,dropRoot - ,parseCollapsedAbsDir - ,parseCollapsedAbsFile - ,concatAndCollapseAbsDir - ,rejectMissingFile - ,rejectMissingDir - ,pathToByteString - ,pathToLazyByteString - ,pathToText - ,tryGetModificationTime + ( toFilePathNoTrailingSep + , dropRoot + , parseCollapsedAbsDir + , parseCollapsedAbsFile + , concatAndCollapseAbsDir + , rejectMissingFile + , rejectMissingDir + , pathToByteString + , pathToLazyByteString + , pathToText + , tryGetModificationTime ) where -import Data.Time (UTCTime) +import Data.Time ( UTCTime ) import Path import Path.IO -import Path.Internal (Path(..)) +import Path.Internal ( Path (..) ) import RIO -import System.IO.Error (isDoesNotExistError) +import System.IO.Error ( isDoesNotExistError ) import qualified Data.ByteString.Char8 as BS import qualified Data.ByteString.Lazy.Char8 as BSL import qualified Data.Text as T diff --git a/src/Path/Find.hs b/src/Path/Find.hs index 1c8d15d025..07b5e58fd2 100644 --- a/src/Path/Find.hs +++ b/src/Path/Find.hs @@ -4,18 +4,19 @@ -- | Finding files. module Path.Find - (findFileUp - ,findDirUp - ,findFiles - ,findInParents) - where + ( findFileUp + , findDirUp + , findFiles + , findInParents + ) where -import RIO -import System.IO.Error (isPermissionError) import qualified Data.List as L -import Path -import Path.IO hiding (findFiles) -import System.PosixCompat.Files (getSymbolicLinkStatus, isSymbolicLink) +import Path +import Path.IO hiding (findFiles) +import RIO +import System.IO.Error ( isPermissionError ) +import System.PosixCompat.Files + ( getSymbolicLinkStatus, isSymbolicLink ) -- | Find the location of a file matching the given predicate. findFileUp :: (MonadIO m,MonadThrow m) diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs index 1caeec7697..0e573755ff 100644 --- a/src/Stack/Build.hs +++ b/src/Stack/Build.hs @@ -8,48 +8,47 @@ -- | Build the project. module Stack.Build - (build - ,buildLocalTargets - ,loadPackage - ,mkBaseConfigOpts - ,queryBuildInfo - ,splitObjsWarning - ,CabalVersionException(..)) - where - -import Stack.Prelude hiding (loadPackage) -import Data.Aeson (Value (Object, Array), (.=), object) + ( build + , buildLocalTargets + , loadPackage + , mkBaseConfigOpts + , queryBuildInfo + , splitObjsWarning + , CabalVersionException (..) + ) where + +import Data.Aeson ( Value (Object, Array), (.=), object ) import qualified Data.Aeson.Key as Key import qualified Data.Aeson.KeyMap as KeyMap -import Data.List ((\\), isPrefixOf) -import Data.List.Extra (groupSort) +import Data.List ( (\\), isPrefixOf ) +import Data.List.Extra ( groupSort ) import qualified Data.List.NonEmpty as NE import qualified Data.Map as Map import qualified Data.Set as Set import qualified Data.Text as T -import Data.Text.Encoding (decodeUtf8) +import Data.Text.Encoding ( decodeUtf8 ) import qualified Data.Text.IO as TIO -import Data.Text.Read (decimal) +import Data.Text.Read ( decimal ) import qualified Data.Vector as V import qualified Data.Yaml as Yaml import qualified Distribution.PackageDescription as C -import Distribution.Types.Dependency (depLibraries) -import Distribution.Version (mkVersion) -import Path (parent) +import Distribution.Types.Dependency ( depLibraries ) +import Distribution.Version ( mkVersion ) +import Path ( parent ) import Stack.Build.ConstructPlan import Stack.Build.Execute import Stack.Build.Installed import Stack.Build.Source import Stack.Package -import Stack.Setup (withNewLocalBuildTargets) +import Stack.Prelude hiding ( loadPackage ) +import Stack.Setup ( withNewLocalBuildTargets ) import Stack.Types.Build +import Stack.Types.Compiler ( compilerVersionText, getGhcVersion ) import Stack.Types.Config import Stack.Types.NamedComponent import Stack.Types.Package import Stack.Types.SourceMap - -import Stack.Types.Compiler (compilerVersionText, getGhcVersion) -import System.Terminal (fixCodePage) +import System.Terminal ( fixCodePage ) data CabalVersionException = AllowNewerNotSupported Version diff --git a/src/Stack/Build/Cache.hs b/src/Stack/Build/Cache.hs index d24bbe8724..f772d0227a 100644 --- a/src/Stack/Build/Cache.hs +++ b/src/Stack/Build/Cache.hs @@ -30,22 +30,22 @@ module Stack.Build.Cache , writePrecompiledCache , readPrecompiledCache -- Exported for testing - , BuildCache(..) + , BuildCache (..) ) where -import Stack.Prelude -import Crypto.Hash (hashWith, SHA256(..)) -import qualified Data.ByteArray as Mem (convert) -import Data.ByteString.Builder (byteString) +import Crypto.Hash ( hashWith, SHA256 (..) ) +import qualified Data.ByteArray as Mem ( convert ) +import Data.ByteString.Builder ( byteString ) import qualified Data.Map as M import qualified Data.Set as Set import qualified Data.Text as T import qualified Data.Yaml as Yaml -import Foreign.C.Types (CTime) +import Foreign.C.Types ( CTime ) import Path import Path.IO import Stack.Constants import Stack.Constants.Config +import Stack.Prelude import Stack.Storage.Project import Stack.Storage.User import Stack.Types.Build @@ -53,8 +53,9 @@ import Stack.Types.Cache import Stack.Types.Config import Stack.Types.GhcPkgId import Stack.Types.NamedComponent -import Stack.Types.SourceMap (smRelDir) -import System.PosixCompat.Files (modificationTime, getFileStatus, setFileTimes) +import Stack.Types.SourceMap ( smRelDir ) +import System.PosixCompat.Files + ( modificationTime, getFileStatus, setFileTimes ) -- | Directory containing files to mark an executable as installed exeInstalledDir :: (HasEnvConfig env) diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs index fdc0dd6d0d..9ff81814cf 100644 --- a/src/Stack/Build/Execute.hs +++ b/src/Stack/Build/Execute.hs @@ -19,8 +19,8 @@ module Stack.Build.Execute , ExecuteEnv , withExecuteEnv , withSingleContext - , ExcludeTHLoading(..) - , KeepOutputOpen(..) + , ExcludeTHLoading (..) + , KeepOutputOpen (..) ) where import Control.Concurrent.Execute diff --git a/src/Stack/Build/Target.hs b/src/Stack/Build/Target.hs index aa1c105aac..ab2e05cc06 100644 --- a/src/Stack/Build/Target.hs +++ b/src/Stack/Build/Target.hs @@ -58,28 +58,28 @@ -- Finally, we upgrade the snapshot by using -- calculatePackagePromotion. module Stack.Build.Target - ( -- * Types - Target (..) - , NeedTargets (..) - , PackageType (..) - , parseTargets - -- * Convenience helpers - , gpdVersion - -- * Test suite exports - , parseRawTarget - , RawTarget (..) - , UnresolvedComponent (..) - ) where + ( -- * Types + Target (..) + , NeedTargets (..) + , PackageType (..) + , parseTargets + -- * Convenience helpers + , gpdVersion + -- * Test suite exports + , parseRawTarget + , RawTarget (..) + , UnresolvedComponent (..) + ) where -import Stack.Prelude import qualified Data.Map as Map import qualified Data.Set as Set import qualified Data.Text as T import Path -import Path.Extra (rejectMissingDir) +import Path.Extra ( rejectMissingDir ) import Path.IO -import RIO.Process (HasProcessContext) +import RIO.Process ( HasProcessContext ) import Stack.SourceMap +import Stack.Prelude import Stack.Types.Config import Stack.Types.NamedComponent import Stack.Types.Build diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs index 857cdd24fc..d0991ededa 100644 --- a/src/Stack/BuildPlan.hs +++ b/src/Stack/BuildPlan.hs @@ -14,7 +14,7 @@ module Stack.BuildPlan ( BuildPlanException (..) , BuildPlanCheck (..) , checkSnapBuildPlan - , DepError(..) + , DepError (..) , DepErrors , removeSrcPkgDefaultFlags , selectBestSnapshot diff --git a/src/Stack/Clean.hs b/src/Stack/Clean.hs index 7a04b7737c..4d7ffb865a 100644 --- a/src/Stack/Clean.hs +++ b/src/Stack/Clean.hs @@ -6,17 +6,17 @@ -- | Clean a project. module Stack.Clean - (clean - ,CleanOpts(..) - ,CleanCommand(..) - ) where + ( clean + , CleanOpts (..) + , CleanCommand (..) + ) where -import Stack.Prelude -import Data.List ((\\),intercalate) +import Data.List ( (\\), intercalate ) import qualified Data.Map.Strict as Map -import Path.IO (ignoringAbsence, removeDirRecur) -import Stack.Config (withBuildConfig) -import Stack.Constants.Config (rootDistDirFromDir, workDirFromDir) +import Path.IO ( ignoringAbsence, removeDirRecur ) +import Stack.Config ( withBuildConfig ) +import Stack.Constants.Config ( rootDistDirFromDir, workDirFromDir ) +import Stack.Prelude import Stack.Types.Config import Stack.Types.SourceMap diff --git a/src/Stack/Config/Build.hs b/src/Stack/Config/Build.hs index e83f72d243..89283f882b 100644 --- a/src/Stack/Config/Build.hs +++ b/src/Stack/Config/Build.hs @@ -4,9 +4,9 @@ -- | Build configuration module Stack.Config.Build where +import Distribution.Verbosity ( normal ) import Stack.Prelude import Stack.Types.Config -import Distribution.Verbosity (normal) -- | Interprets BuildOptsMonoid options. buildOptsFromMonoid :: BuildOptsMonoid -> BuildOpts diff --git a/src/Stack/Config/Docker.hs b/src/Stack/Config/Docker.hs index 0a527ab177..fafe4b014c 100644 --- a/src/Stack/Config/Docker.hs +++ b/src/Stack/Config/Docker.hs @@ -6,10 +6,10 @@ -- | Docker configuration module Stack.Config.Docker where -import Stack.Prelude -import Data.List (find) +import Data.List ( find ) import qualified Data.Text as T -import Distribution.Version (simplifyVersionRange) +import Distribution.Version ( simplifyVersionRange ) +import Stack.Prelude import Stack.Types.Version import Stack.Types.Config import Stack.Types.Docker diff --git a/src/Stack/Config/Nix.hs b/src/Stack/Config/Nix.hs index 34557ba9a8..87f634d604 100644 --- a/src/Stack/Config/Nix.hs +++ b/src/Stack/Config/Nix.hs @@ -10,15 +10,15 @@ module Stack.Config.Nix ,nixCompilerVersion ) where -import Stack.Prelude -import Control.Monad.Extra (ifM) +import Control.Monad.Extra ( ifM ) import qualified Data.Text as T import qualified Data.Text.IO as TIO -import Distribution.System (OS (..)) -import Stack.Constants -import Stack.Types.Config -import Stack.Types.Nix -import System.Directory (doesFileExist) +import Distribution.System ( OS (..) ) +import Stack.Constants +import Stack.Prelude +import Stack.Types.Config +import Stack.Types.Nix +import System.Directory ( doesFileExist ) -- | Type representing exceptions thrown by functions exported by the -- "Stack.Config.Nix" module. diff --git a/src/Stack/ConfigCmd.hs b/src/Stack/ConfigCmd.hs index 34d48b1354..7f698738e2 100644 --- a/src/Stack/ConfigCmd.hs +++ b/src/Stack/ConfigCmd.hs @@ -8,37 +8,42 @@ -- | Make changes to project or global configuration. module Stack.ConfigCmd - (ConfigCmdSet(..) - ,configCmdSetParser - ,cfgCmdSet - ,cfgCmdSetName - ,configCmdEnvParser - ,cfgCmdEnv - ,cfgCmdEnvName - ,cfgCmdName) where + ( ConfigCmdSet (..) + , configCmdSetParser + , cfgCmdSet + , cfgCmdSetName + , configCmdEnvParser + , cfgCmdEnv + , cfgCmdEnvName + , cfgCmdName + ) where -import Stack.Prelude import qualified Data.Aeson.Key as Key import qualified Data.Aeson.KeyMap as KeyMap -import Data.Attoparsec.Text as P (Parser, parseOnly, skip, skipWhile, - string, takeText, takeWhile) +import Data.Attoparsec.Text as P + ( Parser, parseOnly, skip, skipWhile, string, takeText + , takeWhile + ) import qualified Data.Map.Merge.Strict as Map import qualified Data.List.NonEmpty as NE import qualified Data.Text as T import qualified Data.Yaml as Yaml import qualified Options.Applicative as OA -import qualified Options.Applicative.Types as OA import Options.Applicative.Builder.Extra -import Pantry (loadSnapshot) +import qualified Options.Applicative.Types as OA +import Pantry ( loadSnapshot ) import Path import qualified RIO.Map as Map -import RIO.Process (envVarsL) -import Stack.Config (makeConcreteResolver, getProjectConfig, - getImplicitGlobalProjectDir) +import RIO.Process ( envVarsL ) +import Stack.Config + ( makeConcreteResolver, getProjectConfig + , getImplicitGlobalProjectDir + ) import Stack.Constants +import Stack.Prelude import Stack.Types.Config import Stack.Types.Resolver -import System.Environment (getEnvironment) +import System.Environment ( getEnvironment ) -- | Type repesenting exceptions thrown by functions exported by the -- "Stack.ConfigCmd" module. diff --git a/src/Stack/Constants/Config.hs b/src/Stack/Constants/Config.hs index 6020a79d39..f447d84116 100644 --- a/src/Stack/Constants/Config.hs +++ b/src/Stack/Constants/Config.hs @@ -23,10 +23,10 @@ module Stack.Constants.Config , templatesDir ) where -import Stack.Prelude -import Stack.Constants -import Stack.Types.Config -import Path +import Path +import Stack.Constants +import Stack.Prelude +import Stack.Types.Config -- | Output .o/.hi directory. objectInterfaceDirL :: HasBuildConfig env => Getting r env (Path Abs Dir) diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs index 67e7d60aaf..9cd068b522 100644 --- a/src/Stack/Coverage.hs +++ b/src/Stack/Coverage.hs @@ -12,13 +12,12 @@ module Stack.Coverage ( deleteHpcReports , updateTixFile , generateHpcReport - , HpcReportOpts(..) + , HpcReportOpts (..) , generateHpcReportForTargets , generateHpcUnifiedReport , generateHpcMarkupIndex ) where -import Stack.Prelude hiding (Display (..)) import qualified Data.ByteString.Char8 as S8 import qualified Data.ByteString.Lazy as BL import qualified Data.List as L @@ -26,22 +25,23 @@ import qualified Data.Map.Strict as Map import qualified Data.Set as Set import qualified Data.Text as T import qualified Data.Text.Lazy as LT -import Distribution.Version (mkVersion) +import Distribution.Version ( mkVersion ) import Path -import Path.Extra (toFilePathNoTrailingSep) +import Path.Extra ( toFilePathNoTrailingSep ) import Path.IO +import qualified RIO +import RIO.Process import Stack.Build.Target import Stack.Constants import Stack.Constants.Config import Stack.Package +import Stack.Prelude hiding ( Display (..) ) import Stack.Types.Compiler import Stack.Types.Config import Stack.Types.NamedComponent import Stack.Types.Package import Stack.Types.SourceMap -import System.FilePath (isPathSeparator) -import qualified RIO -import RIO.Process +import System.FilePath ( isPathSeparator ) import Trace.Hpc.Tix import Web.Browser (openBrowser) diff --git a/src/Stack/DefaultColorWhen.hs b/src/Stack/DefaultColorWhen.hs index 25d614afec..0210276054 100644 --- a/src/Stack/DefaultColorWhen.hs +++ b/src/Stack/DefaultColorWhen.hs @@ -2,11 +2,10 @@ module Stack.DefaultColorWhen ( defaultColorWhen ) where -import Stack.Prelude (stdout) -import Stack.Types.Config (ColorWhen (ColorAuto, ColorNever)) - -import System.Console.ANSI (hSupportsANSIWithoutEmulation) -import System.Environment (lookupEnv) +import Stack.Prelude ( stdout ) +import Stack.Types.Config ( ColorWhen (ColorAuto, ColorNever) ) +import System.Console.ANSI ( hSupportsANSIWithoutEmulation ) +import System.Environment ( lookupEnv ) -- | The default adopts the standard proposed at http://no-color.org/, that -- color should not be added by default if the @NO_COLOR@ environment variable diff --git a/src/Stack/Docker.hs b/src/Stack/Docker.hs index 5fbc7b0231..6c2888a811 100644 --- a/src/Stack/Docker.hs +++ b/src/Stack/Docker.hs @@ -18,7 +18,7 @@ module Stack.Docker , pull , reset , reExecArgName - , DockerException(..) + , DockerException (..) , getProjectRoot , runContainerAndExit ) where diff --git a/src/Stack/Dot.hs b/src/Stack/Dot.hs index 3ff8362d4d..64e441f04a 100644 --- a/src/Stack/Dot.hs +++ b/src/Stack/Dot.hs @@ -4,17 +4,18 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TupleSections #-} -module Stack.Dot (dot - ,listDependencies - ,DotOpts(..) - ,DotPayload(..) - ,ListDepsOpts(..) - ,ListDepsFormat(..) - ,ListDepsFormatOpts(..) - ,resolveDependencies - ,printGraph - ,pruneGraph - ) where +module Stack.Dot + ( dot + , listDependencies + , DotOpts (..) + , DotPayload (..) + , ListDepsOpts (..) + , ListDepsFormat (..) + , ListDepsFormatOpts (..) + , resolveDependencies + , printGraph + , pruneGraph + ) where import Data.Aeson import qualified Data.ByteString.Lazy.Char8 as LBC8 @@ -25,28 +26,28 @@ import qualified Data.Map as Map import qualified Data.Text as Text import qualified Data.Text.IO as Text import qualified Data.Traversable as T -import Distribution.Text (display) +import Distribution.License ( License (BSD3), licenseFromSPDX ) import qualified Distribution.PackageDescription as PD import qualified Distribution.SPDX.License as SPDX -import Distribution.License (License(BSD3), licenseFromSPDX) -import Distribution.Types.PackageName (mkPackageName) +import Distribution.Text ( display ) +import Distribution.Types.PackageName ( mkPackageName ) import qualified Path -import RIO.Process (HasProcessContext (..)) -import Stack.Build (loadPackage) -import Stack.Build.Installed (getInstalled, toInstallMap) +import RIO.Process ( HasProcessContext (..) ) +import Stack.Build ( loadPackage ) +import Stack.Build.Installed ( getInstalled, toInstallMap ) import Stack.Build.Source +import Stack.Build.Target( NeedTargets (..), parseTargets ) import Stack.Constants import Stack.Package -import Stack.Prelude hiding (Display (..), pkgName, loadPackage) -import qualified Stack.Prelude (pkgName) +import Stack.Prelude hiding ( Display (..), pkgName, loadPackage ) +import qualified Stack.Prelude ( pkgName ) import Stack.Runners import Stack.SourceMap import Stack.Types.Build -import Stack.Types.Compiler (wantedToActual) +import Stack.Types.Compiler ( wantedToActual ) import Stack.Types.Config import Stack.Types.GhcPkgId import Stack.Types.SourceMap -import Stack.Build.Target(NeedTargets(..), parseTargets) -- | Type representing exceptions thrown by functions exported by the -- "Stack.Dot" module. diff --git a/src/Stack/FileWatch.hs b/src/Stack/FileWatch.hs index a895dfd838..64480c69c2 100644 --- a/src/Stack/FileWatch.hs +++ b/src/Stack/FileWatch.hs @@ -3,19 +3,19 @@ {-# LANGUAGE TupleSections #-} module Stack.FileWatch - ( WatchMode (WatchModePoll) - , fileWatch - , fileWatchPoll - ) where + ( WatchMode (WatchModePoll) + , fileWatch + , fileWatchPoll + ) where -import Control.Concurrent.STM (check) +import Control.Concurrent.STM ( check ) import qualified Data.Map.Strict as Map import qualified Data.Set as Set import GHC.IO.Exception import Path import Stack.Prelude import System.FSNotify -import System.IO (getLine) +import System.IO ( getLine ) fileWatch :: (HasLogFunc env, HasTerm env) diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs index 78ea08cc23..50e59ade4b 100644 --- a/src/Stack/Ghci.hs +++ b/src/Stack/Ghci.hs @@ -9,18 +9,17 @@ -- | Run a GHCi configured with the user's package(s). module Stack.Ghci - ( GhciOpts(..) - , GhciPkgInfo(..) - , GhciException(..) - , ghci - ) where - -import Stack.Prelude hiding (Display (..)) -import Control.Monad.State.Strict (State, execState, get, modify) -import Data.ByteString.Builder (byteString) + ( GhciOpts (..) + , GhciPkgInfo (..) + , GhciException (..) + , ghci + ) where + +import Control.Monad.State.Strict ( State, execState, get, modify ) +import Data.ByteString.Builder ( byteString ) import qualified Data.ByteString.Char8 as S8 import qualified Data.ByteString.Lazy as LBS -import Data.Foldable (foldl) +import Data.Foldable ( foldl ) import qualified Data.List as L import qualified Data.List.NonEmpty as NE import qualified Data.Map.Strict as M @@ -30,8 +29,8 @@ import qualified Data.Text.Lazy as TL import qualified Data.Text.Lazy.Encoding as TLE import qualified Distribution.PackageDescription as C import Path -import Path.Extra (toFilePathNoTrailingSep) -import Path.IO hiding (withSystemTempDir) +import Path.Extra ( toFilePathNoTrailingSep ) +import Path.IO hiding ( withSystemTempDir ) import qualified RIO import RIO.Process ( HasProcessContext, exec, proc, readProcess_ @@ -45,15 +44,16 @@ import Stack.Constants import Stack.Constants.Config import Stack.Ghci.Script import Stack.Package +import Stack.Prelude hiding ( Display (..) ) import Stack.Types.Build import Stack.Types.Config import Stack.Types.NamedComponent import Stack.Types.Package import Stack.Types.PackageFile import Stack.Types.SourceMap -import System.IO (putStrLn) -import System.IO.Temp (getCanonicalTemporaryDirectory) -import System.Permissions (setScriptPerms) +import System.IO ( putStrLn ) +import System.IO.Temp ( getCanonicalTemporaryDirectory ) +import System.Permissions ( setScriptPerms ) -- | Type representing exceptions thrown by functions exported by the -- "Stack.Ghci" module. diff --git a/src/Stack/Ghci/Script.hs b/src/Stack/Ghci/Script.hs index 6319c19c99..dd323e3333 100644 --- a/src/Stack/Ghci/Script.hs +++ b/src/Stack/Ghci/Script.hs @@ -14,14 +14,14 @@ module Stack.Ghci.Script , scriptToFile ) where -import Data.ByteString.Builder (toLazyByteString) +import Data.ByteString.Builder ( toLazyByteString ) import qualified Data.List as L import qualified Data.Set as S +import Distribution.ModuleName hiding ( toFilePath ) import Path -import Stack.Prelude hiding (Module) -import System.IO (hSetBinaryMode) +import Stack.Prelude hiding ( Module ) +import System.IO ( hSetBinaryMode ) -import Distribution.ModuleName hiding (toFilePath) newtype GhciScript = GhciScript { unGhciScript :: [GhciCommand] } diff --git a/src/Stack/Hoogle.hs b/src/Stack/Hoogle.hs index 37a26a84ea..2373547737 100644 --- a/src/Stack/Hoogle.hs +++ b/src/Stack/Hoogle.hs @@ -4,21 +4,21 @@ -- | A wrapper around hoogle. module Stack.Hoogle - ( hoogleCmd - ) where + ( hoogleCmd + ) where -import Stack.Prelude import qualified Data.ByteString.Lazy.Char8 as BL8 -import Data.Char (isSpace) +import Data.Char ( isSpace ) import qualified Data.Text as T -import Distribution.PackageDescription (packageDescription, package) -import Distribution.Types.PackageName (mkPackageName) -import Distribution.Version (mkVersion) -import Lens.Micro ((?~)) -import Path (parseAbsFile) -import Path.IO hiding (findExecutable) +import Distribution.PackageDescription ( packageDescription, package ) +import Distribution.Types.PackageName ( mkPackageName ) +import Distribution.Version ( mkVersion ) +import Lens.Micro ( (?~) ) +import Path ( parseAbsFile ) +import Path.IO hiding ( findExecutable ) import qualified Stack.Build -import Stack.Build.Target (NeedTargets(NeedTargets)) +import Stack.Build.Target ( NeedTargets (NeedTargets) ) +import Stack.Prelude import Stack.Runners import Stack.Types.Config import Stack.Types.SourceMap diff --git a/src/Stack/IDE.hs b/src/Stack/IDE.hs index cf31f5f2a1..05fb0a8e14 100644 --- a/src/Stack/IDE.hs +++ b/src/Stack/IDE.hs @@ -7,8 +7,8 @@ -- | Functions for IDEs. module Stack.IDE - ( OutputStream(..) - , ListPackagesCmd(..) + ( OutputStream (..) + , ListPackagesCmd (..) , listPackages , listTargets ) where diff --git a/src/Stack/List.hs b/src/Stack/List.hs index 7d0fef94e2..6b73a50556 100644 --- a/src/Stack/List.hs +++ b/src/Stack/List.hs @@ -6,10 +6,10 @@ module Stack.List ( listPackages ) where -import Stack.Prelude +import RIO.List ( intercalate ) import qualified RIO.Map as Map -import RIO.List (intercalate) -import RIO.Process (HasProcessContext) +import RIO.Process ( HasProcessContext ) +import Stack.Prelude -- | Type representing exceptions thrown by functions exported by the -- "Stack.List" module. diff --git a/src/Stack/Lock.hs b/src/Stack/Lock.hs index 64d81a36f0..4811e970e6 100644 --- a/src/Stack/Lock.hs +++ b/src/Stack/Lock.hs @@ -5,24 +5,24 @@ {-# LANGUAGE RecordWildCards #-} module Stack.Lock - ( lockCachedWanted - , LockedLocation(..) - , Locked(..) - ) where + ( lockCachedWanted + , LockedLocation (..) + , Locked (..) + ) where -import Pantry.Internal.AesonExtended -import Data.ByteString.Builder (byteString) +import Data.ByteString.Builder ( byteString ) import qualified Data.List.NonEmpty as NE import qualified Data.Map as Map import qualified Data.Text as T import qualified Data.Yaml as Yaml -import Path (parent) -import Path.Extended (addExtension) -import Path.IO (doesFileExist) -import Stack.Prelude -import Stack.SourceMap -import Stack.Types.Config -import Stack.Types.SourceMap +import Pantry.Internal.AesonExtended +import Path ( parent ) +import Path.Extended ( addExtension ) +import Path.IO ( doesFileExist ) +import Stack.Prelude +import Stack.SourceMap +import Stack.Types.Config +import Stack.Types.SourceMap -- | Type representing exceptions thrown by functions exported by the -- "Stack.Lock" module. diff --git a/src/Stack/New.hs b/src/Stack/New.hs index 7632e49168..61d2846c6f 100644 --- a/src/Stack/New.hs +++ b/src/Stack/New.hs @@ -12,7 +12,7 @@ module Stack.New ( new - , NewOpts(..) + , NewOpts (..) , TemplateName , templatesHelp ) where diff --git a/src/Stack/Options/BuildMonoidParser.hs b/src/Stack/Options/BuildMonoidParser.hs index f10c0b98ea..df357bc993 100644 --- a/src/Stack/Options/BuildMonoidParser.hs +++ b/src/Stack/Options/BuildMonoidParser.hs @@ -3,10 +3,10 @@ module Stack.Options.BuildMonoidParser where import qualified Data.Text as T -import Distribution.Parsec (eitherParsec) +import Distribution.Parsec ( eitherParsec ) import Options.Applicative import Options.Applicative.Builder.Extra -import Stack.Build (splitObjsWarning) +import Stack.Build ( splitObjsWarning ) import Stack.Prelude import Stack.Options.BenchParser import Stack.Options.TestParser diff --git a/src/Stack/Options/BuildParser.hs b/src/Stack/Options/BuildParser.hs index 548552a447..15c0c30827 100644 --- a/src/Stack/Options/BuildParser.hs +++ b/src/Stack/Options/BuildParser.hs @@ -8,7 +8,7 @@ import Options.Applicative import Options.Applicative.Args import Options.Applicative.Builder.Extra import Stack.Options.Completion -import Stack.Options.PackageParser (readFlag) +import Stack.Options.PackageParser ( readFlag ) import Stack.Prelude import Stack.Types.Config diff --git a/src/Stack/Options/Completion.hs b/src/Stack/Options/Completion.hs index 4698353194..08b7984761 100644 --- a/src/Stack/Options/Completion.hs +++ b/src/Stack/Options/Completion.hs @@ -9,8 +9,8 @@ module Stack.Options.Completion , projectExeCompleter ) where -import Data.Char (isSpace) -import Data.List (isPrefixOf) +import Data.Char ( isSpace ) +import Data.List ( isPrefixOf ) import qualified Data.Map as Map import Data.Maybe import qualified Data.Set as Set @@ -18,8 +18,8 @@ import qualified Data.Text as T import qualified Distribution.PackageDescription as C import Options.Applicative import Options.Applicative.Builder.Extra -import Stack.Constants (ghcShowOptionsOutput) -import Stack.Options.GlobalParser (globalOptsFromMonoid) +import Stack.Constants ( ghcShowOptionsOutput ) +import Stack.Options.GlobalParser ( globalOptsFromMonoid ) import Stack.Runners import Stack.Prelude import Stack.Types.Config diff --git a/src/Stack/Options/DockerParser.hs b/src/Stack/Options/DockerParser.hs index 5d22f876dc..f13a49d4d6 100644 --- a/src/Stack/Options/DockerParser.hs +++ b/src/Stack/Options/DockerParser.hs @@ -2,9 +2,9 @@ module Stack.Options.DockerParser where -import Data.List (intercalate) -import qualified Data.Text as T -import Distribution.Version (anyVersion) +import Data.List ( intercalate ) +import qualified Data.Text as T +import Distribution.Version ( anyVersion ) import Options.Applicative import Options.Applicative.Args import Options.Applicative.Builder.Extra diff --git a/src/Stack/Options/GhcVariantParser.hs b/src/Stack/Options/GhcVariantParser.hs index a81541d928..20e466c8cd 100644 --- a/src/Stack/Options/GhcVariantParser.hs +++ b/src/Stack/Options/GhcVariantParser.hs @@ -3,7 +3,7 @@ module Stack.Options.GhcVariantParser where import Options.Applicative -import Options.Applicative.Types (readerAsk) +import Options.Applicative.Types ( readerAsk ) import Stack.Prelude import Stack.Options.Utils import Stack.Types.Config diff --git a/src/Stack/Options/HpcReportParser.hs b/src/Stack/Options/HpcReportParser.hs index 224ff71fc2..2d19a24dc1 100644 --- a/src/Stack/Options/HpcReportParser.hs +++ b/src/Stack/Options/HpcReportParser.hs @@ -2,12 +2,12 @@ module Stack.Options.HpcReportParser where -import qualified Data.Text as T +import qualified Data.Text as T import Options.Applicative import Options.Applicative.Builder.Extra -import Options.Applicative.Types (readerAsk) -import Stack.Coverage (HpcReportOpts (..)) -import Stack.Options.Completion (targetCompleter) +import Options.Applicative.Types ( readerAsk ) +import Stack.Coverage ( HpcReportOpts (..) ) +import Stack.Options.Completion ( targetCompleter ) import Stack.Prelude import Stack.Types.Config diff --git a/src/Stack/Options/LogLevelParser.hs b/src/Stack/Options/LogLevelParser.hs index 65bcddc654..d7bc46d98a 100644 --- a/src/Stack/Options/LogLevelParser.hs +++ b/src/Stack/Options/LogLevelParser.hs @@ -3,7 +3,7 @@ module Stack.Options.LogLevelParser where -import qualified Data.Text as T +import qualified Data.Text as T import Options.Applicative import Stack.Options.Utils import Stack.Prelude diff --git a/src/Stack/Options/NewParser.hs b/src/Stack/Options/NewParser.hs index d60abf9af5..e302e20418 100644 --- a/src/Stack/Options/NewParser.hs +++ b/src/Stack/Options/NewParser.hs @@ -2,7 +2,7 @@ module Stack.Options.NewParser where -import qualified Data.Map.Strict as M +import qualified Data.Map.Strict as M import Options.Applicative import Stack.Init import Stack.New diff --git a/src/Stack/Options/NixParser.hs b/src/Stack/Options/NixParser.hs index e02d1a6d85..dd27d8f6f4 100644 --- a/src/Stack/Options/NixParser.hs +++ b/src/Stack/Options/NixParser.hs @@ -2,7 +2,7 @@ module Stack.Options.NixParser where -import qualified Data.Text as T +import qualified Data.Text as T import Options.Applicative import Options.Applicative.Args import Options.Applicative.Builder.Extra diff --git a/src/Stack/Options/PackageParser.hs b/src/Stack/Options/PackageParser.hs index 0313a557e6..d13a849829 100644 --- a/src/Stack/Options/PackageParser.hs +++ b/src/Stack/Options/PackageParser.hs @@ -2,11 +2,11 @@ module Stack.Options.PackageParser where -import qualified Data.Map as Map +import qualified Data.Map as Map import Options.Applicative -import Options.Applicative.Types (readerAsk) +import Options.Applicative.Types ( readerAsk ) import Stack.Prelude -import Stack.Types.Config.Build (ApplyCLIFlag (..)) +import Stack.Types.Config.Build ( ApplyCLIFlag (..) ) -- | Parser for package:[-]flag readFlag :: ReadM (Map ApplyCLIFlag (Map FlagName Bool)) diff --git a/src/Stack/Options/ResolverParser.hs b/src/Stack/Options/ResolverParser.hs index d4ac25092e..baa3a1863a 100644 --- a/src/Stack/Options/ResolverParser.hs +++ b/src/Stack/Options/ResolverParser.hs @@ -3,9 +3,9 @@ module Stack.Options.ResolverParser where -import qualified Data.Text as T +import qualified Data.Text as T import Options.Applicative -import Options.Applicative.Types (readerAsk) +import Options.Applicative.Types ( readerAsk ) import Stack.Options.Utils import Stack.Prelude import Stack.Types.Resolver diff --git a/src/Stack/Options/SDistParser.hs b/src/Stack/Options/SDistParser.hs index e1f712788a..0463ca682b 100644 --- a/src/Stack/Options/SDistParser.hs +++ b/src/Stack/Options/SDistParser.hs @@ -6,7 +6,7 @@ import Options.Applicative import Options.Applicative.Builder.Extra import Stack.Prelude import Stack.SDist -import Stack.Options.HpcReportParser (pvpBoundsOption) +import Stack.Options.HpcReportParser ( pvpBoundsOption ) -- | Parser for arguments to `stack sdist` sdistOptsParser :: Parser SDistOpts diff --git a/src/Stack/Options/UploadParser.hs b/src/Stack/Options/UploadParser.hs index 41955fb4cb..7efb1b8f2b 100644 --- a/src/Stack/Options/UploadParser.hs +++ b/src/Stack/Options/UploadParser.hs @@ -1,15 +1,15 @@ {-# LANGUAGE NoImplicitPrelude #-} module Stack.Options.UploadParser - ( UploadOpts(..) - , UploadVariant(..) + ( UploadOpts (..) + , UploadVariant (..) , uploadOptsParser ) where import Options.Applicative -import Stack.Options.SDistParser (sdistOptsParser) +import Stack.Options.SDistParser ( sdistOptsParser ) import Stack.Prelude -import Stack.SDist (SDistOpts(..)) +import Stack.SDist ( SDistOpts (..) ) data UploadOpts = UploadOpts { uoptsSDistOpts :: SDistOpts diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs index 92d2c9532e..05ddf92f8f 100644 --- a/src/Stack/Package.hs +++ b/src/Stack/Package.hs @@ -10,65 +10,67 @@ -- | Dealing with Cabal. module Stack.Package - (readDotBuildinfo - ,resolvePackage - ,packageFromPackageDescription - ,Package(..) - ,PackageDescriptionPair(..) - ,GetPackageOpts(..) - ,PackageConfig(..) - ,buildLogPath - ,PackageException (..) - ,resolvePackageDescription - ,packageDependencies - ,applyForceCustomBuild + ( readDotBuildinfo + , resolvePackage + , packageFromPackageDescription + , Package (..) + , PackageDescriptionPair (..) + , GetPackageOpts (..) + , PackageConfig (..) + , buildLogPath + , PackageException (..) + , resolvePackageDescription + , packageDependencies + , applyForceCustomBuild ) where -import Data.List (unzip) +import Data.List ( unzip ) import qualified Data.Map.Strict as M import qualified Data.Set as S import qualified Data.Text as T import Distribution.CabalSpecVersion import Distribution.Compiler -import Distribution.Package hiding (Package, packageName, packageVersion, PackageIdentifier) -import Distribution.PackageDescription hiding (FlagName) +import Distribution.Package + hiding + ( Package, packageName, packageVersion, PackageIdentifier ) +import Distribution.PackageDescription hiding ( FlagName ) #if !MIN_VERSION_Cabal(3,8,1) import Distribution.PackageDescription.Parsec #endif -import Distribution.Pretty (prettyShow) +import Distribution.Pretty ( prettyShow ) #if MIN_VERSION_Cabal(3,8,1) -import Distribution.Simple.PackageDescription (readHookedBuildInfo) +import Distribution.Simple.PackageDescription ( readHookedBuildInfo ) #endif -import Distribution.System (OS (..), Arch, Platform (..)) -import Distribution.Text (display) +import Distribution.System ( OS (..), Arch, Platform (..) ) +import Distribution.Text ( display ) import qualified Distribution.Types.CondTree as Cabal import qualified Distribution.Types.ExeDependency as Cabal import qualified Distribution.Types.LegacyExeDependency as Cabal import Distribution.Types.MungedPackageName import qualified Distribution.Types.UnqualComponentName as Cabal -import Distribution.Utils.Path (getSymbolicPath) -import Distribution.Verbosity (silent) -import Distribution.Version (mkVersion, orLaterVersion, anyVersion) -import Path as FL hiding (replaceExtension) +import Distribution.Utils.Path ( getSymbolicPath ) +import Distribution.Verbosity ( silent ) +import Distribution.Version ( mkVersion, orLaterVersion, anyVersion ) +import Path as FL hiding ( replaceExtension ) import Path.Extra -import Path.IO hiding (findFiles) +import Path.IO hiding ( findFiles ) import Stack.Build.Installed import Stack.Constants import Stack.Constants.Config -import Stack.Prelude hiding (Display (..)) +import Stack.Prelude hiding ( Display (..) ) import Stack.Types.Compiler import Stack.Types.Config import Stack.Types.GhcPkgId import Stack.Types.NamedComponent import Stack.Types.Package import Stack.Types.Version -import System.FilePath (replaceExtension) -import Stack.Types.Dependency (DepValue(..), DepType (..)) +import System.FilePath ( replaceExtension ) +import Stack.Types.Dependency ( DepValue (..), DepType (..) ) import Stack.Types.PackageFile ( GetPackageFileContext (..), DotCabalPath , GetPackageFiles (..) ) -import Stack.PackageFile (packageDescModulesAndFiles) +import Stack.PackageFile ( packageDescModulesAndFiles ) import Stack.ComponentFile -- | Read @.buildinfo@ ancillary files produced by some Setup.hs hooks. -- The file includes Cabal file syntax to be merged into the package description diff --git a/src/Stack/PackageDump.hs b/src/Stack/PackageDump.hs index e39d75033b..00fb1d420b 100644 --- a/src/Stack/PackageDump.hs +++ b/src/Stack/PackageDump.hs @@ -6,18 +6,17 @@ {-# LANGUAGE TupleSections #-} module Stack.PackageDump - ( Line - , eachSection - , eachPair - , DumpPackage (..) - , conduitDumpPackage - , ghcPkgDump - , ghcPkgDescribe - , sinkMatching - , pruneDeps - ) where + ( Line + , eachSection + , eachPair + , DumpPackage (..) + , conduitDumpPackage + , ghcPkgDump + , ghcPkgDescribe + , sinkMatching + , pruneDeps + ) where -import Stack.Prelude import Data.Attoparsec.Args import Data.Attoparsec.Text as P import Data.Conduit @@ -25,13 +24,15 @@ import qualified Data.Conduit.List as CL import qualified Data.Conduit.Text as CT import qualified Data.Map as Map import qualified Data.Set as Set -import qualified RIO.Text as T import qualified Distribution.Text as C -import Path.Extra (toFilePathNoTrailingSep) +import Path.Extra ( toFilePathNoTrailingSep ) +import RIO.Process hiding ( readProcess ) +import qualified RIO.Text as T import Stack.GhcPkg -import Stack.Types.Config (HasCompiler (..), GhcPkgExe (..), DumpPackage (..)) +import Stack.Prelude +import Stack.Types.Config + ( HasCompiler (..), GhcPkgExe (..), DumpPackage (..) ) import Stack.Types.GhcPkgId -import RIO.Process hiding (readProcess) -- | Type representing exceptions thrown by functions exported by the -- "Stack.PackageDump" module. diff --git a/src/Stack/Runners.hs b/src/Stack/Runners.hs index 438b9bffc6..115a5e0ed7 100644 --- a/src/Stack/Runners.hs +++ b/src/Stack/Runners.hs @@ -10,32 +10,32 @@ -- configuration parsing. For example, we want @withConfig $ -- withConfig $ ...@ to fail. module Stack.Runners - ( withBuildConfig - , withEnvConfig - , withDefaultEnvConfig - , withConfig - , withGlobalProject - , withRunnerGlobal - , ShouldReexec (..) - ) where + ( withBuildConfig + , withEnvConfig + , withDefaultEnvConfig + , withConfig + , withGlobalProject + , withRunnerGlobal + , ShouldReexec (..) + ) where -import Stack.Prelude -import RIO.Process (mkDefaultProcessContext) -import RIO.Time (addUTCTime, getCurrentTime) -import Stack.Build.Target(NeedTargets(..)) +import RIO.Process ( mkDefaultProcessContext ) +import RIO.Time ( addUTCTime, getCurrentTime ) +import Stack.Build.Target ( NeedTargets (..) ) import Stack.Config import Stack.Constants -import Stack.DefaultColorWhen (defaultColorWhen) +import Stack.DefaultColorWhen ( defaultColorWhen ) import qualified Stack.Docker as Docker import qualified Stack.Nix as Nix +import Stack.Prelude import Stack.Setup -import Stack.Storage.User (upgradeChecksSince, logUpgradeCheck) +import Stack.Storage.User ( upgradeChecksSince, logUpgradeCheck ) import Stack.Types.Config -import Stack.Types.Docker (dockerEnable) -import Stack.Types.Nix (nixEnable) -import Stack.Types.Version (stackMinorVersion, minorVersion) -import System.Console.ANSI (hSupportsANSIWithoutEmulation) -import System.Terminal (getTerminalWidth) +import Stack.Types.Docker ( dockerEnable ) +import Stack.Types.Nix ( nixEnable ) +import Stack.Types.Version ( stackMinorVersion, minorVersion ) +import System.Console.ANSI ( hSupportsANSIWithoutEmulation ) +import System.Terminal ( getTerminalWidth ) -- | Type representing exceptions thrown by functions exported by the -- "Stack.Runners" module. diff --git a/src/Stack/SDist.hs b/src/Stack/SDist.hs index 39392c5ed6..6d0421d219 100644 --- a/src/Stack/SDist.hs +++ b/src/Stack/SDist.hs @@ -8,19 +8,18 @@ -- Create a source distribution tarball module Stack.SDist - ( getSDistTarball - , checkSDistTarball - , checkSDistTarball' - , SDistOpts (..) - ) where + ( getSDistTarball + , checkSDistTarball + , checkSDistTarball' + , SDistOpts (..) + ) where import qualified Codec.Archive.Tar as Tar import qualified Codec.Archive.Tar.Entry as Tar import qualified Codec.Compression.GZip as GZip import Control.Applicative import Control.Concurrent.Execute - ( ActionContext(..), Concurrency(..) ) -import Stack.Prelude hiding ( Display (..) ) + ( ActionContext (..), Concurrency (..) ) import qualified Data.ByteString as S import qualified Data.ByteString.Char8 as S8 import qualified Data.ByteString.Lazy as L @@ -54,11 +53,12 @@ import Stack.Build ( mkBaseConfigOpts, build, buildLocalTargets ) import Stack.Build.Execute import Stack.Build.Installed import Stack.Build.Source ( projectLocalPackages ) -import Stack.Types.GhcPkgId import Stack.Package +import Stack.Prelude hiding ( Display (..) ) import Stack.SourceMap import Stack.Types.Build import Stack.Types.Config +import Stack.Types.GhcPkgId import Stack.Types.Package import Stack.Types.SourceMap import Stack.Types.Version diff --git a/src/Stack/SetupCmd.hs b/src/Stack/SetupCmd.hs index e2aa56ca37..50966bf18a 100644 --- a/src/Stack/SetupCmd.hs +++ b/src/Stack/SetupCmd.hs @@ -7,10 +7,10 @@ -- | Install GHC/GHCJS and Cabal. module Stack.SetupCmd - ( setup - , setupParser - , SetupCmdOpts(..) - ) where + ( setup + , setupParser + , SetupCmdOpts (..) + ) where import Control.Applicative import qualified Data.Text as T diff --git a/src/Stack/Types/Build.hs b/src/Stack/Types/Build.hs index 3ebdd76c9b..4f04a3f996 100644 --- a/src/Stack/Types/Build.hs +++ b/src/Stack/Types/Build.hs @@ -9,67 +9,66 @@ -- | Build-specific types. module Stack.Types.Build - (BuildException(..) - ,BuildPrettyException(..) - ,ConstructPlanException(..) - ,BadDependency(..) - ,ParentMap - ,FlagSource(..) - ,UnusedFlags(..) - ,InstallLocation(..) - ,Installed(..) - ,psVersion - ,Task(..) - ,taskIsTarget - ,taskLocation - ,taskTargetIsMutable - ,LocalPackage(..) - ,BaseConfigOpts(..) - ,Plan(..) - ,TestOpts(..) - ,BenchmarkOpts(..) - ,FileWatchOpts(..) - ,BuildOpts(..) - ,BuildSubset(..) - ,defaultBuildOpts - ,TaskType(..) - ,IsMutable(..) - ,installLocationIsMutable - ,TaskConfigOpts(..) - ,BuildCache(..) - ,ConfigCache(..) - ,configureOpts - ,CachePkgSrc (..) - ,toCachePkgSrc - ,isStackOpt - ,wantedLocalPackages - ,FileCacheInfo (..) - ,ConfigureOpts (..) - ,PrecompiledCache (..) - ) - where - -import Data.Aeson (ToJSON, FromJSON) -import qualified Data.ByteString as S -import Data.Char (isSpace) -import Data.List as L -import qualified Data.Map as Map -import qualified Data.Map.Strict as M -import Data.Monoid.Map (MonoidMap(..)) -import qualified Data.Set as Set -import qualified Data.Text as T + ( BuildException (..) + , BuildPrettyException (..) + , ConstructPlanException (..) + , BadDependency (..) + , ParentMap + , FlagSource (..) + , UnusedFlags (..) + , InstallLocation (..) + , Installed (..) + , psVersion + , Task (..) + , taskIsTarget + , taskLocation + , taskTargetIsMutable + , LocalPackage (..) + , BaseConfigOpts (..) + , Plan (..) + , TestOpts (..) + , BenchmarkOpts (..) + , FileWatchOpts (..) + , BuildOpts (..) + , BuildSubset (..) + , defaultBuildOpts + , TaskType (..) + , IsMutable (..) + , installLocationIsMutable + , TaskConfigOpts (..) + , BuildCache (..) + , ConfigCache (..) + , configureOpts + , CachePkgSrc (..) + , toCachePkgSrc + , isStackOpt + , wantedLocalPackages + , FileCacheInfo (..) + , ConfigureOpts (..) + , PrecompiledCache (..) + ) where + +import Data.Aeson ( ToJSON, FromJSON ) +import qualified Data.ByteString as S +import Data.Char ( isSpace ) +import Data.List as L +import qualified Data.Map as Map +import qualified Data.Map.Strict as M +import Data.Monoid.Map ( MonoidMap (..) ) +import qualified Data.Set as Set +import qualified Data.Text as T import Database.Persist.Sql - ( PersistField (..), PersistFieldSql(..) + ( PersistField (..), PersistFieldSql (..) , PersistValue (PersistText), SqlType (SqlString) ) import Distribution.PackageDescription ( TestSuiteInterface, mkPackageName ) -import Distribution.System (Arch) -import qualified Distribution.Text as C -import qualified Distribution.Version as C -import Path (parseRelDir, (), parent) -import Path.Extra (toFilePathNoTrailingSep) -import RIO.Process (showProcessArgDebug) +import Distribution.System ( Arch ) +import qualified Distribution.Text as C +import qualified Distribution.Version as C +import Path ( parseRelDir, (), parent ) +import Path.Extra ( toFilePathNoTrailingSep ) +import RIO.Process ( showProcessArgDebug ) import Stack.Constants import Stack.Prelude import Stack.Types.Compiler @@ -79,7 +78,7 @@ import Stack.Types.GhcPkgId import Stack.Types.NamedComponent import Stack.Types.Package import Stack.Types.Version -import System.FilePath (pathSeparator) +import System.FilePath ( pathSeparator ) -- | Type representing exceptions thrown by functions exported by modules with -- names beginning @Stack.Build@. diff --git a/src/Stack/Types/Cache.hs b/src/Stack/Types/Cache.hs index 2961c312ed..e412059647 100644 --- a/src/Stack/Types/Cache.hs +++ b/src/Stack/Types/Cache.hs @@ -2,14 +2,14 @@ {-# LANGUAGE OverloadedStrings #-} module Stack.Types.Cache - ( ConfigCacheType(..) - , Action(..) - ) where + ( ConfigCacheType (..) + , Action (..) + ) where import qualified Data.Text as T -import Database.Persist.Sql -import Stack.Prelude -import Stack.Types.GhcPkgId +import Database.Persist.Sql +import Stack.Prelude +import Stack.Types.GhcPkgId -- | Type of config cache data ConfigCacheType diff --git a/src/Stack/Types/Compiler.hs b/src/Stack/Types/Compiler.hs index f83e9b61d1..93eef31084 100644 --- a/src/Stack/Types/Compiler.hs +++ b/src/Stack/Types/Compiler.hs @@ -28,7 +28,7 @@ import Database.Persist.Sql import qualified Data.Text as T import Stack.Prelude import Stack.Types.Version -import Distribution.Version (mkVersion) +import Distribution.Version ( mkVersion ) -- | Type representing exceptions thrown by functions exported by the -- "Stack.Types.Compiler" module. diff --git a/src/Stack/Types/CompilerBuild.hs b/src/Stack/Types/CompilerBuild.hs index 475fe0ebe0..50b85d9aa5 100644 --- a/src/Stack/Types/CompilerBuild.hs +++ b/src/Stack/Types/CompilerBuild.hs @@ -1,14 +1,14 @@ {-# LANGUAGE NoImplicitPrelude #-} module Stack.Types.CompilerBuild - (CompilerBuild(..) - ,compilerBuildName - ,compilerBuildSuffix - ,parseCompilerBuild + ( CompilerBuild (..) + , compilerBuildName + , compilerBuildSuffix + , parseCompilerBuild ) where import Stack.Prelude -import Pantry.Internal.AesonExtended (FromJSON, parseJSON, withText) +import Pantry.Internal.AesonExtended ( FromJSON, parseJSON, withText ) import Data.Text as T data CompilerBuild diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs index 0822685b90..a03316f6f1 100644 --- a/src/Stack/Types/Config.hs +++ b/src/Stack/Types/Config.hs @@ -22,89 +22,89 @@ module Stack.Types.Config ( -- * Main configuration types and classes -- ** HasPlatform & HasStackRoot - HasPlatform(..) - , PlatformVariant(..) + HasPlatform (..) + , PlatformVariant (..) -- ** Runner - , HasRunner(..) - , Runner(..) - , ColorWhen(..) + , HasRunner (..) + , Runner (..) + , ColorWhen (..) , terminalL , reExecL -- ** Config & HasConfig - , Config(..) - , HasConfig(..) + , Config (..) + , HasConfig (..) , askLatestSnapshotUrl , configProjectRoot -- ** BuildConfig & HasBuildConfig - , BuildConfig(..) - , ProjectPackage(..) - , DepPackage(..) + , BuildConfig (..) + , ProjectPackage (..) + , DepPackage (..) , ppRoot , ppVersion , ppComponents , ppGPD , stackYamlL , projectRootL - , HasBuildConfig(..) + , HasBuildConfig (..) -- ** Storage databases - , UserStorage(..) - , ProjectStorage(..) + , UserStorage (..) + , ProjectStorage (..) -- ** GHCVariant & HasGHCVariant - , GHCVariant(..) + , GHCVariant (..) , ghcVariantName , ghcVariantSuffix , parseGHCVariant - , HasGHCVariant(..) + , HasGHCVariant (..) , snapshotsDir -- ** EnvConfig & HasEnvConfig - , EnvConfig(..) - , HasSourceMap(..) - , HasEnvConfig(..) + , EnvConfig (..) + , HasSourceMap (..) + , HasEnvConfig (..) , getCompilerPath -- * Details -- ** ApplyGhcOptions - , ApplyGhcOptions(..) + , ApplyGhcOptions (..) -- ** AllowNewerDeps - , AllowNewerDeps(..) + , AllowNewerDeps (..) -- ** CabalConfigKey - , CabalConfigKey(..) + , CabalConfigKey (..) -- ** ConfigException - , HpackExecutable(..) - , ConfigException(..) - , ConfigPrettyException(..) - , ParseAbsolutePathException(..) + , HpackExecutable (..) + , ConfigException (..) + , ConfigPrettyException (..) + , ParseAbsolutePathException (..) , packageIndicesWarning -- ** ConfigMonoid - , ConfigMonoid(..) + , ConfigMonoid (..) , configMonoidInstallGHCName , configMonoidSystemGHCName , parseConfigMonoid -- ** DumpLogs - , DumpLogs(..) + , DumpLogs (..) -- ** EnvSettings - , EnvSettings(..) + , EnvSettings (..) , minimalEnvSettings , defaultEnvSettings , plainEnvSettings -- ** GlobalOpts & GlobalOptsMonoid - , GlobalOpts(..) - , GlobalOptsMonoid(..) + , GlobalOpts (..) + , GlobalOptsMonoid (..) , rslInLogL - , StackYamlLoc(..) + , StackYamlLoc (..) , stackYamlLocL - , LockFileBehavior(..) + , LockFileBehavior (..) , readLockFileBehavior , lockFileBehaviorL , defaultLogLevel -- ** Project & ProjectAndConfigMonoid - , Project(..) - , ProjectConfig(..) - , Curator(..) - , ProjectAndConfigMonoid(..) + , Project (..) + , ProjectConfig (..) + , Curator (..) + , ProjectAndConfigMonoid (..) , parseProjectAndConfigMonoid -- ** PvpBounds - , PvpBounds(..) - , PvpBoundsType(..) + , PvpBounds (..) + , PvpBoundsType (..) , parsePvpBounds -- ** ColorWhen , readColorWhen @@ -114,7 +114,7 @@ module Stack.Types.Config , SCM(..) -- * Paths , bindirSuffix - , GlobalInfoSource(..) + , GlobalInfoSource (..) , getProjectWorkDir , docDirSuffix , extraBinDirs @@ -138,30 +138,30 @@ module Stack.Types.Config -- * Command-related types , AddCommand -- ** Eval - , EvalOpts(..) + , EvalOpts (..) -- ** Exec - , ExecOpts(..) - , SpecialExecCmd(..) - , ExecOptsExtra(..) + , ExecOpts (..) + , SpecialExecCmd (..) + , ExecOptsExtra (..) -- ** Setup - , DownloadInfo(..) - , VersionedDownloadInfo(..) - , GHCDownloadInfo(..) - , SetupInfo(..) + , DownloadInfo (..) + , VersionedDownloadInfo (..) + , GHCDownloadInfo (..) + , SetupInfo (..) -- ** Docker entrypoint - , DockerEntrypoint(..) - , DockerUser(..) + , DockerEntrypoint (..) + , DockerUser (..) , module X -- * Lens helpers , wantedCompilerVersionL , actualCompilerVersionL - , HasCompiler(..) - , DumpPackage(..) - , CompilerPaths(..) - , GhcPkgExe(..) + , HasCompiler (..) + , DumpPackage (..) + , CompilerPaths (..) + , GhcPkgExe (..) , getGhcPkgExe , cpWhich - , ExtraDirs(..) + , ExtraDirs (..) , buildOptsL , globalOptsL , buildOptsInstallExesL @@ -193,7 +193,7 @@ import Pantry.Internal.AesonExtended , withText, object, (.=), (..:), (...:), (..:?), (..!=) , Value(Bool), withObjectWarnings, WarningParser, Object , jsonSubWarnings, jsonSubWarningsT, jsonSubWarningsTT - , WithJSONWarnings(..) + , WithJSONWarnings (..) , FromJSONKeyFunction (FromJSONKeyTextParser) ) import Data.Attoparsec.Args ( parseArgs, EscapingMode (Escaping) ) diff --git a/src/Stack/Types/Config/Build.hs b/src/Stack/Types/Config/Build.hs index 000d428215..51e7dee179 100644 --- a/src/Stack/Types/Config/Build.hs +++ b/src/Stack/Types/Config/Build.hs @@ -8,23 +8,23 @@ module Stack.Types.Config.Build ( - BuildOpts(..) - , BuildCommand(..) + BuildOpts (..) + , BuildCommand (..) , defaultBuildOpts , defaultBuildOptsCLI - , BuildOptsCLI(..) - , BuildOptsMonoid(..) - , TestOpts(..) + , BuildOptsCLI (..) + , BuildOptsMonoid (..) + , TestOpts (..) , defaultTestOpts - , TestOptsMonoid(..) - , HaddockOpts(..) + , TestOptsMonoid (..) + , HaddockOpts (..) , defaultHaddockOpts - , HaddockOptsMonoid(..) - , BenchmarkOpts(..) + , HaddockOptsMonoid (..) + , BenchmarkOpts (..) , defaultBenchmarkOpts - , BenchmarkOptsMonoid(..) - , FileWatchOpts(..) - , BuildSubset(..) + , BenchmarkOptsMonoid (..) + , FileWatchOpts (..) + , BuildSubset (..) , ApplyCLIFlag (..) , boptsCLIFlagsByName , CabalVerbosity (..) @@ -34,9 +34,9 @@ module Stack.Types.Config.Build import qualified Data.Map.Strict as Map import qualified Data.Text as T -import Distribution.Parsec (Parsec (..), simpleParsec) -import Distribution.Verbosity (Verbosity, normal, verbose) -import Generics.Deriving.Monoid (memptydefault, mappenddefault) +import Distribution.Parsec ( Parsec (..), simpleParsec ) +import Distribution.Verbosity ( Verbosity, normal, verbose ) +import Generics.Deriving.Monoid ( memptydefault, mappenddefault ) import Pantry.Internal.AesonExtended import Stack.Prelude diff --git a/src/Stack/Types/Dependency.hs b/src/Stack/Types/Dependency.hs index cce4074fc6..bf5cfa81ee 100644 --- a/src/Stack/Types/Dependency.hs +++ b/src/Stack/Types/Dependency.hs @@ -1,14 +1,13 @@ {-# LANGUAGE NoImplicitPrelude #-} module Stack.Types.Dependency - (DepValue(..) - ,DepType(..) - ) - where + ( DepValue (..) + , DepType (..) + ) where -import Stack.Prelude -import Distribution.Types.VersionRange (VersionRange) -import Stack.Types.Version (intersectVersionRanges) +import Distribution.Types.VersionRange ( VersionRange ) +import Stack.Prelude +import Stack.Types.Version ( intersectVersionRanges ) -- | The value for a map from dependency name. This contains both the diff --git a/src/Stack/Types/Docker.hs b/src/Stack/Types/Docker.hs index d54a04270c..2291166359 100644 --- a/src/Stack/Types/Docker.hs +++ b/src/Stack/Types/Docker.hs @@ -9,17 +9,17 @@ module Stack.Types.Docker where -import Stack.Prelude hiding (Display (..)) -import Pantry.Internal.AesonExtended -import Data.List (intercalate) +import Data.List ( intercalate ) import qualified Data.Text as T -import Distribution.System (Platform(..), OS(..), Arch(..)) -import Distribution.Text (simpleParse, display) -import Distribution.Version (anyVersion) -import Generics.Deriving.Monoid (mappenddefault, memptydefault) -import Path -import Stack.Types.Version -import Text.Read (Read (..)) +import Distribution.System ( Platform (..), OS (..), Arch (..) ) +import Distribution.Text ( simpleParse, display ) +import Distribution.Version ( anyVersion ) +import Generics.Deriving.Monoid ( mappenddefault, memptydefault ) +import Pantry.Internal.AesonExtended +import Path +import Stack.Prelude hiding ( Display (..) ) +import Stack.Types.Version +import Text.Read ( Read (..) ) -- | Type representing exceptions thrown by functions exported by the -- "Stack.Docker" module. diff --git a/src/Stack/Types/GhcPkgId.hs b/src/Stack/Types/GhcPkgId.hs index ab66b4948f..1e04b0e51a 100644 --- a/src/Stack/Types/GhcPkgId.hs +++ b/src/Stack/Types/GhcPkgId.hs @@ -6,19 +6,19 @@ -- | A ghc-pkg id. module Stack.Types.GhcPkgId - (GhcPkgId - ,unGhcPkgId - ,ghcPkgIdParser - ,parseGhcPkgId - ,ghcPkgIdString) - where + ( GhcPkgId + , unGhcPkgId + , ghcPkgIdParser + , parseGhcPkgId + , ghcPkgIdString + ) where import Stack.Prelude import Pantry.Internal.AesonExtended import Data.Attoparsec.Text import qualified Data.Text as T -import Database.Persist.Sql (PersistField, PersistFieldSql) -import Prelude (Read (..)) +import Database.Persist.Sql ( PersistField, PersistFieldSql ) +import Prelude ( Read (..) ) -- | A parse fail. newtype GhcPkgIdParseFail diff --git a/src/Stack/Types/NamedComponent.hs b/src/Stack/Types/NamedComponent.hs index 438a13190b..31f63ed602 100644 --- a/src/Stack/Types/NamedComponent.hs +++ b/src/Stack/Types/NamedComponent.hs @@ -17,10 +17,10 @@ module Stack.Types.NamedComponent , isCBench ) where -import Pantry -import Stack.Prelude import qualified Data.Set as Set import qualified Data.Text as T +import Pantry +import Stack.Prelude -- | A single, fully resolved component of a package data NamedComponent diff --git a/src/Stack/Types/Nix.hs b/src/Stack/Types/Nix.hs index 4ea2543cf7..bdcecacab9 100644 --- a/src/Stack/Types/Nix.hs +++ b/src/Stack/Types/Nix.hs @@ -8,9 +8,9 @@ module Stack.Types.Nix where -import Pantry.Internal.AesonExtended -import Stack.Prelude -import Generics.Deriving.Monoid (mappenddefault, memptydefault) +import Generics.Deriving.Monoid ( mappenddefault, memptydefault ) +import Pantry.Internal.AesonExtended +import Stack.Prelude -- | Nix configuration. Parameterize by resolver type to avoid cyclic -- dependency. diff --git a/src/Stack/Types/Package.hs b/src/Stack/Types/Package.hs index ef5fb2c447..fec71f6316 100644 --- a/src/Stack/Types/Package.hs +++ b/src/Stack/Types/Package.hs @@ -13,24 +13,30 @@ module Stack.Types.Package where import Stack.Prelude import qualified RIO.Text as T -import Data.Aeson (ToJSON (..), FromJSON (..), (.=), (.:), object, withObject) +import Data.Aeson + ( ToJSON (..), FromJSON (..), (.=), (.:), object, withObject + ) import qualified Data.Map as M import qualified Data.Set as Set import Distribution.CabalSpecVersion -import Distribution.Parsec (PError (..), PWarning (..), showPos) +import Distribution.Parsec ( PError (..), PWarning (..), showPos ) import qualified Distribution.SPDX.License as SPDX -import Distribution.License (License) -import Distribution.ModuleName (ModuleName) -import Distribution.PackageDescription (TestSuiteInterface, BuildType) -import Distribution.System (Platform (..)) +import Distribution.License ( License ) +import Distribution.ModuleName ( ModuleName ) +import Distribution.PackageDescription + ( TestSuiteInterface, BuildType ) +import Distribution.System ( Platform (..) ) import Stack.Types.Compiler import Stack.Types.Config import Stack.Types.GhcPkgId import Stack.Types.NamedComponent import Stack.Types.SourceMap import Stack.Types.Version -import Stack.Types.Dependency (DepValue) -import Stack.Types.PackageFile (GetPackageFiles(..), DotCabalDescriptor(..), DotCabalPath(..)) +import Stack.Types.Dependency ( DepValue ) +import Stack.Types.PackageFile + ( GetPackageFiles (..), DotCabalDescriptor (..) + , DotCabalPath (..) + ) -- | Type representing exceptions thrown by functions exported by the -- "Stack.Package" module. diff --git a/src/Stack/Types/PackageName.hs b/src/Stack/Types/PackageName.hs index d988def9a7..d1bd531cfe 100644 --- a/src/Stack/Types/PackageName.hs +++ b/src/Stack/Types/PackageName.hs @@ -4,8 +4,8 @@ -- | Names for packages. module Stack.Types.PackageName - ( packageNameArgument - ) where + ( packageNameArgument + ) where import Stack.Prelude import qualified Options.Applicative as O diff --git a/src/Stack/Types/Resolver.hs b/src/Stack/Types/Resolver.hs index a81cc8e8c5..baa88153d4 100644 --- a/src/Stack/Types/Resolver.hs +++ b/src/Stack/Types/Resolver.hs @@ -11,22 +11,21 @@ {-# LANGUAGE UndecidableInstances #-} module Stack.Types.Resolver - (AbstractResolver(..) - ,readAbstractResolver - ,Snapshots (..) + ( AbstractResolver (..) + , readAbstractResolver + , Snapshots (..) ) where -import Pantry.Internal.AesonExtended - (FromJSON, parseJSON, - withObject, (.:), withText) import qualified Data.Aeson.Key as Key import qualified Data.Aeson.KeyMap as KeyMap import qualified Data.IntMap.Strict as IntMap import qualified Data.Text as T -import Data.Text.Read (decimal) -import Data.Time (Day) -import Options.Applicative (ReadM) +import Data.Text.Read ( decimal ) +import Data.Time ( Day ) +import Options.Applicative ( ReadM ) import qualified Options.Applicative.Types as OA +import Pantry.Internal.AesonExtended + ( FromJSON, parseJSON, withObject, (.:), withText ) import Stack.Prelude -- | Type representing exceptions thrown by functions exported by the diff --git a/src/Stack/Types/SourceMap.hs b/src/Stack/Types/SourceMap.hs index 0f81a86027..14e0c7edbd 100644 --- a/src/Stack/Types/SourceMap.hs +++ b/src/Stack/Types/SourceMap.hs @@ -25,12 +25,12 @@ module Stack.Types.SourceMap ) where import qualified Data.Text as T +import Distribution.PackageDescription ( GenericPackageDescription ) import qualified Pantry.SHA256 as SHA256 -import Path -import Stack.Prelude -import Stack.Types.Compiler -import Stack.Types.NamedComponent -import Distribution.PackageDescription (GenericPackageDescription) +import Path +import Stack.Prelude +import Stack.Types.Compiler +import Stack.Types.NamedComponent -- | Common settings for both dependency and project package. data CommonPackage = CommonPackage diff --git a/src/Stack/Types/TemplateName.hs b/src/Stack/Types/TemplateName.hs index f39075fff5..b7969b5608 100644 --- a/src/Stack/Types/TemplateName.hs +++ b/src/Stack/Types/TemplateName.hs @@ -17,9 +17,9 @@ module Stack.Types.TemplateName , defaultTemplateName ) where -import Data.Aeson (FromJSON (..), withText) +import Data.Aeson ( FromJSON (..), withText ) import qualified Data.Text as T -import Network.HTTP.StackClient (parseRequest) +import Network.HTTP.StackClient ( parseRequest ) import qualified Options.Applicative as O import Path import Stack.Prelude diff --git a/src/Stack/Unpack.hs b/src/Stack/Unpack.hs index 78f8168a7c..2d75c2d052 100644 --- a/src/Stack/Unpack.hs +++ b/src/Stack/Unpack.hs @@ -6,14 +6,14 @@ module Stack.Unpack ( unpackPackages ) where -import Stack.Prelude -import qualified RIO.Text as T +import Path ( (), parseRelDir ) +import Path.IO ( doesDirExist ) +import RIO.List ( intercalate ) import qualified RIO.Map as Map +import RIO.Process ( HasProcessContext ) import qualified RIO.Set as Set -import RIO.List (intercalate) -import RIO.Process (HasProcessContext) -import Path ((), parseRelDir) -import Path.IO (doesDirExist) +import qualified RIO.Text as T +import Stack.Prelude -- | Type representing exceptions thrown by functions exported by the -- "Stack.Unpack" module. diff --git a/src/Stack/Upgrade.hs b/src/Stack/Upgrade.hs index ebb37b8bed..88837ac17f 100644 --- a/src/Stack/Upgrade.hs +++ b/src/Stack/Upgrade.hs @@ -5,10 +5,10 @@ {-# LANGUAGE OverloadedStrings #-} module Stack.Upgrade - ( upgrade - , UpgradeOpts - , upgradeOpts - ) where + ( upgrade + , UpgradeOpts + , upgradeOpts + ) where import qualified Data.Text as T import Options.Applicative diff --git a/src/Stack/Upload.hs b/src/Stack/Upload.hs index ed699c4d21..68bb81a2ad 100644 --- a/src/Stack/Upload.hs +++ b/src/Stack/Upload.hs @@ -7,19 +7,19 @@ -- | Provide ability to upload tarballs to Hackage. module Stack.Upload - ( -- * Upload - upload - , uploadBytes - , uploadRevision - -- * Credentials - , HackageCreds - , HackageAuth(..) - , HackageKey(..) - , loadAuth - , writeFilePrivate - -- * Internal - , maybeGetHackageKey - ) where + ( -- * Upload + upload + , uploadBytes + , uploadRevision + -- * Credentials + , HackageCreds + , HackageAuth (..) + , HackageKey (..) + , loadAuth + , writeFilePrivate + -- * Internal + , maybeGetHackageKey + ) where import Conduit ( mapOutput, sinkList ) import Data.Aeson diff --git a/src/System/Process/Pager.hs b/src/System/Process/Pager.hs index c474ebce96..1b28b6874b 100644 --- a/src/System/Process/Pager.hs +++ b/src/System/Process/Pager.hs @@ -10,16 +10,17 @@ module System.Process.Pager , PagerException (..) ) where -import Stack.Prelude -import System.Directory (findExecutable) -import System.Environment (lookupEnv) -import System.Process ( createProcess, cmdspec, shell, proc, waitForProcess - , CmdSpec (ShellCommand, RawCommand) - , StdStream (CreatePipe) - , CreateProcess (std_in, close_fds, delegate_ctlc) - ) -import Control.Monad.Trans.Maybe (MaybeT (runMaybeT, MaybeT)) +import Control.Monad.Trans.Maybe ( MaybeT (runMaybeT, MaybeT) ) import qualified Data.Text.IO as T +import Stack.Prelude +import System.Directory ( findExecutable ) +import System.Environment ( lookupEnv ) +import System.Process + ( createProcess, cmdspec, shell, proc, waitForProcess + , CmdSpec (ShellCommand, RawCommand) + , StdStream (CreatePipe) + , CreateProcess (std_in, close_fds, delegate_ctlc) + ) -- | Type representing exceptions thrown by functions exported by the -- "System.Process.Pager" module. diff --git a/src/main/BuildInfo.hs b/src/main/BuildInfo.hs index b500eaa90c..ae0fd1e5d1 100644 --- a/src/main/BuildInfo.hs +++ b/src/main/BuildInfo.hs @@ -14,28 +14,24 @@ module BuildInfo , hpackVersion ) where -import Stack.Prelude -import qualified Paths_stack as Meta -import qualified Distribution.Text as Cabal (display) -import Distribution.System (buildArch) - #ifndef HIDE_DEP_VERSIONS import qualified Build_stack #endif - #ifdef USE_GIT_INFO -import GitHash (giCommitCount, giHash, tGitInfoCwdTry) +import Data.Version ( versionBranch ) +#else +import Data.Version ( showVersion, versionBranch ) #endif - +import Distribution.System ( buildArch ) +import qualified Distribution.Text as Cabal ( display ) #ifdef USE_GIT_INFO -import Options.Applicative.Simple (simpleVersion) +import GitHash ( giCommitCount, giHash, tGitInfoCwdTry ) #endif - #ifdef USE_GIT_INFO -import Data.Version (versionBranch) -#else -import Data.Version (showVersion, versionBranch) +import Options.Applicative.Simple ( simpleVersion ) #endif +import Stack.Prelude +import qualified Paths_stack as Meta versionString' :: String #ifdef USE_GIT_INFO diff --git a/src/main/Main.hs b/src/main/Main.hs index 999b046b6f..764cc3aa63 100644 --- a/src/main/Main.hs +++ b/src/main/Main.hs @@ -33,8 +33,8 @@ import Pantry ( loadSnapshot ) import Path import Path.IO import Stack.Build -import Stack.Build.Target ( NeedTargets(..) ) -import Stack.Clean ( CleanCommand(..), CleanOpts(..), clean ) +import Stack.Build.Target ( NeedTargets (..) ) +import Stack.Clean ( CleanCommand (..), CleanOpts (..), clean ) import Stack.Config import Stack.ConfigCmd as ConfigCmd import Stack.Constants diff --git a/src/test/Stack/ArgsSpec.hs b/src/test/Stack/ArgsSpec.hs index a578db53e1..283e195317 100644 --- a/src/test/Stack/ArgsSpec.hs +++ b/src/test/Stack/ArgsSpec.hs @@ -4,14 +4,14 @@ module Stack.ArgsSpec where -import Control.Monad -import Data.Attoparsec.Args (EscapingMode(..), parseArgsFromString) -import Data.Attoparsec.Interpreter (interpreterArgsParser) +import Control.Monad +import Data.Attoparsec.Args ( EscapingMode (..), parseArgsFromString ) +import Data.Attoparsec.Interpreter ( interpreterArgsParser ) import qualified Data.Attoparsec.Text as P -import Data.Text (pack) -import Stack.Prelude -import Test.Hspec -import Prelude (head) +import Data.Text ( pack ) +import Stack.Prelude +import Test.Hspec +import Prelude ( head ) -- | Test spec. spec :: Spec diff --git a/src/test/Stack/LockSpec.hs b/src/test/Stack/LockSpec.hs index fe94a26041..6ab96d0f8a 100644 --- a/src/test/Stack/LockSpec.hs +++ b/src/test/Stack/LockSpec.hs @@ -4,16 +4,16 @@ module Stack.LockSpec where -import Pantry.Internal.AesonExtended (WithJSONWarnings(..)) +import Pantry.Internal.AesonExtended ( WithJSONWarnings (..) ) import qualified Data.Yaml as Yaml -import Distribution.Types.PackageName (mkPackageName) -import Distribution.Types.Version (mkVersion) -import Pantry +import Distribution.Types.PackageName ( mkPackageName ) +import Distribution.Types.Version ( mkVersion ) +import Pantry import qualified Pantry.SHA256 as SHA256 -import RIO -import Stack.Lock -import Test.Hspec -import Text.RawString.QQ +import RIO +import Stack.Lock +import Test.Hspec +import Text.RawString.QQ toBlobKey :: ByteString -> Word -> BlobKey toBlobKey string size = BlobKey (decodeSHA string) (FileSize size) diff --git a/src/test/Stack/PackageDumpSpec.hs b/src/test/Stack/PackageDumpSpec.hs index 2c01247377..8483d4e50a 100644 --- a/src/test/Stack/PackageDumpSpec.hs +++ b/src/test/Stack/PackageDumpSpec.hs @@ -5,14 +5,14 @@ module Stack.PackageDumpSpec where import Conduit -import qualified Data.Conduit.List as CL -import Data.Conduit.Text (decodeUtf8) -import qualified Data.Map as Map -import qualified Data.Set as Set -import Distribution.License (License(..)) -import Distribution.Types.PackageName (mkPackageName) -import Distribution.Version (mkVersion) -import Path (parseAbsFile) +import qualified Data.Conduit.List as CL +import Data.Conduit.Text ( decodeUtf8 ) +import qualified Data.Map as Map +import qualified Data.Set as Set +import Distribution.License ( License (..) ) +import Distribution.Types.PackageName ( mkPackageName ) +import Distribution.Version ( mkVersion ) +import Path ( parseAbsFile ) import Stack.PackageDump import Stack.Prelude import Stack.Types.Config diff --git a/test/integration/tests/git-submodules/Main.hs b/test/integration/tests/git-submodules/Main.hs index 964830364f..dfab9c8960 100644 --- a/test/integration/tests/git-submodules/Main.hs +++ b/test/integration/tests/git-submodules/Main.hs @@ -1,10 +1,11 @@ import StackTest -import System.Directory (createDirectoryIfMissing,withCurrentDirectory, getCurrentDirectory) -import System.Exit (exitFailure) -import System.FilePath (()) -import Data.List (filter) -import System.IO (hPutStrLn, withFile, IOMode(..)) -import Control.Monad (when) +import System.Directory + ( createDirectoryIfMissing, withCurrentDirectory, getCurrentDirectory ) +import System.Exit ( exitFailure ) +import System.FilePath ( () ) +import Data.List ( filter ) +import System.IO ( hPutStrLn, withFile, IOMode (..) ) +import Control.Monad ( when ) main :: IO () main = when isLinux $ do diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs index b237acd99e..bba1739242 100644 --- a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs +++ b/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs @@ -1,15 +1,18 @@ -module TestUtil( - (==>), QFilePath(..), QFilePathValidW(..), QFilePathValidP(..), - module Test.QuickCheck, - module Data.List, - module Data.Maybe - ) where - -import Test.QuickCheck hiding ((==>)) -import Data.List -import Data.Maybe -import Control.Monad +module TestUtil + ( (==>) + , QFilePath (..) + , QFilePathValidW (..) + , QFilePathValidP (..) + , module Test.QuickCheck + , module Data.List + , module Data.Maybe + ) where + +import Test.QuickCheck hiding ( (==>) ) +import Data.List +import Data.Maybe +import Control.Monad import qualified System.FilePath.Windows as W import qualified System.FilePath.Posix as P