Add explicit imports

commercialhaskell · Apr 20, 2023 · 6617d85 · 6617d85
1 parent 36e5680
commit 6617d85
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 49 deletions.
diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs
@@ -17,31 +17,44 @@ module Stack.BuildPlan
     , showItems
     ) where
 
-import           Stack.Prelude hiding (Display (..))
 import qualified Data.Foldable as F
-import qualified Data.Set as Set
 import           Data.List (intercalate)
 import qualified Data.List.NonEmpty as NonEmpty
 import qualified Data.Map as Map
+import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Distribution.Package as C
-import           Distribution.PackageDescription (GenericPackageDescription,
-                                                  flagDefault, flagManual,
-                                                  flagName, genPackageFlags)
+import           Distribution.PackageDescription
+                   ( GenericPackageDescription, flagDefault, flagName
+                   , flagManual, genPackageFlags
+                   )
 import qualified Distribution.PackageDescription as C
-import           Distribution.System (Platform)
-import           Distribution.Text (display)
-import           Distribution.Types.UnqualComponentName (unUnqualComponentName)
+import           Distribution.System ( Platform )
+import           Distribution.Text ( display )
+import           Distribution.Types.UnqualComponentName
+                   ( unUnqualComponentName )
 import qualified Distribution.Version as C
-import           Stack.Constants
+import           Stack.Constants ( wiredInPackages )
 import           Stack.Package
+                   ( PackageConfig (..), packageDependencies
+                   , pdpModifiedBuildable, resolvePackageDescription
+                   )
+import           Stack.Prelude hiding ( Display (..) )
 import           Stack.SourceMap
+                   ( SnapshotCandidate, loadProjectSnapshotCandidate )
+import           Stack.Types.Compiler
+                   ( ActualCompiler, WhichCompiler (..), compilerVersionText
+                   , whichCompiler
+                   )
+import           Stack.Types.Config ( HasConfig )
 import           Stack.Types.GHCVariant ( HasGHCVariant )
 import           Stack.Types.Platform ( HasPlatform (..) )
 import           Stack.Types.SourceMap
-import           Stack.Types.Version
-import           Stack.Types.Config
-import           Stack.Types.Compiler
+                   ( CommonPackage (..), DepPackage (..)
+                   , GlobalPackageVersion (..), ProjectPackage (..)
+                   , SMActual (..)
+                   )
+import           Stack.Types.Version ( VersionRange, withinRange )
 
 -- | Type representing exceptions thrown by functions exported by the
 -- "Stack.BuildPlan" module.

diff --git a/src/Stack/Options/BuildParser.hs b/src/Stack/Options/BuildParser.hs
@@ -9,20 +9,22 @@ module Stack.Options.BuildParser
 
 import qualified Data.Map as Map
 import           Options.Applicative
-import           Options.Applicative.Args
-import           Options.Applicative.Builder.Extra
+                   ( Parser, completer, flag, flag', help, internal, long
+                   , metavar, option, switch
+                   )
+import           Options.Applicative.Args ( cmdOption )
+import           Options.Applicative.Builder.Extra ( textArgument, textOption )
 import           Stack.Options.Completion
+                   ( flagCompleter, ghcOptsCompleter, targetCompleter )
 import           Stack.Options.PackageParser ( readFlag )
 import           Stack.Prelude
 import           Stack.Types.BuildOpts
                    ( ApplyCLIFlag, BuildCommand, BuildOptsCLI (..)
                    , BuildSubset (..), FileWatchOpts (..)
                    )
-import           Stack.Types.Config ()
 
 -- | Parser for CLI-only build arguments
-buildOptsParser :: BuildCommand
-                -> Parser BuildOptsCLI
+buildOptsParser :: BuildCommand -> Parser BuildOptsCLI
 buildOptsParser cmd = BuildOptsCLI
   <$> targetsParser
   <*> switch

diff --git a/src/Stack/Options/Completion.hs b/src/Stack/Options/Completion.hs
@@ -11,24 +11,26 @@ module Stack.Options.Completion
 import           Data.Char ( isSpace )
 import           Data.List ( isPrefixOf )
 import qualified Data.Map as Map
-import           Data.Maybe
 import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Distribution.PackageDescription as C
-import           Options.Applicative
-import           Options.Applicative.Builder.Extra
+import           Options.Applicative ( Completer, mkCompleter )
+import           Options.Applicative.Builder.Extra ( unescapeBashArg )
 import           Stack.Constants ( ghcShowOptionsOutput )
 import           Stack.Options.GlobalParser ( globalOptsFromMonoid )
 import           Stack.Runners
+                   ( ShouldReexec (..), withConfig, withDefaultEnvConfig
+                   , withRunnerGlobal
+                   )
 import           Stack.Prelude
 import           Stack.Types.BuildConfig ( BuildConfig (..), HasBuildConfig (..) )
 import           Stack.Types.Config ( Config (..) )
 import           Stack.Types.EnvConfig ( EnvConfig )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
 import           Stack.Types.Project ( Project (..) )
 import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
-import           Stack.Types.NamedComponent
-import           Stack.Types.SourceMap
+import           Stack.Types.NamedComponent ( renderPkgComponent )
+import           Stack.Types.SourceMap ( SMWanted (..), ppComponents, ppGPD )
 
 ghcOptsCompleter :: Completer
 ghcOptsCompleter = mkCompleter $ \inputRaw -> pure $

diff --git a/src/Stack/Options/ExecParser.hs b/src/Stack/Options/ExecParser.hs
@@ -8,11 +8,14 @@ module Stack.Options.ExecParser
   ) where
 
 import           Options.Applicative
-import           Options.Applicative.Builder.Extra
-import           Options.Applicative.Args
+                   ( Parser, completer, help, idm, long, metavar, strArgument
+                   , strOption
+                   )
+import           Options.Applicative.Builder.Extra ( boolFlags, dirCompleter )
+import           Options.Applicative.Args ( argsOption )
 import           Stack.Exec
                    ( ExecOpts (..), ExecOptsExtra (..), SpecialExecCmd (..) )
-import           Stack.Options.Completion
+import           Stack.Options.Completion ( projectExeCompleter )
 import           Stack.Prelude
 import           Stack.Types.EnvSettings ( EnvSettings (..) )
 

diff --git a/src/Stack/Options/NewParser.hs b/src/Stack/Options/NewParser.hs
@@ -6,15 +6,17 @@ module Stack.Options.NewParser
 
 import qualified Data.Map.Strict as M
 import           Options.Applicative
-import           Stack.Init
-import           Stack.New
-import           Stack.Options.InitParser
+                   ( Parser, help, long, metavar, short, switch )
+import           Stack.Init ( InitOpts )
+import           Stack.New ( NewOpts (..) )
+import           Stack.Options.InitParser ( initOptsParser )
 import           Stack.Prelude
-import           Stack.Types.PackageName
+import           Stack.Types.PackageName ( packageNameArgument )
 import           Stack.Types.TemplateName
+                   ( templateNameArgument, templateParamArgument )
 
 -- | Parser for @stack new@.
-newOptsParser :: Parser (NewOpts,InitOpts)
+newOptsParser :: Parser (NewOpts, InitOpts)
 newOptsParser = (,) <$> newOpts <*> initOptsParser
  where
   newOpts = NewOpts

diff --git a/src/Stack/Options/NixParser.hs b/src/Stack/Options/NixParser.hs
@@ -6,12 +6,16 @@ module Stack.Options.NixParser
 
 import qualified Data.Text as T
 import           Options.Applicative
-import           Options.Applicative.Args
+                   ( Parser, completer, help, long, metavar, option, str )
+import           Options.Applicative.Args ( argsOption )
 import           Options.Applicative.Builder.Extra
-import           Stack.Nix
-import           Stack.Options.Utils
+                   ( fileExtCompleter, firstBoolFlagsFalse
+                   , firstBoolFlagsNoDefault, optionalFirst
+                   )
+import           Stack.Nix ( nixCmdName )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
-import           Stack.Types.Nix
+import           Stack.Types.Nix ( NixOptsMonoid (..) )
 
 nixOptsParser :: Bool -> Parser NixOptsMonoid
 nixOptsParser hide0 = overrideActivation <$>

diff --git a/src/Stack/Options/SDistParser.hs b/src/Stack/Options/SDistParser.hs
@@ -7,9 +7,12 @@ module Stack.Options.SDistParser
  ) where
 
 import           Options.Applicative
-import           Options.Applicative.Builder.Extra
+                   ( Parser, completer, help, idm, long, metavar, strArgument
+                   , strOption, switch
+                   )
+import           Options.Applicative.Builder.Extra ( boolFlags, dirCompleter )
 import           Stack.Prelude
-import           Stack.SDist
+import           Stack.SDist ( SDistOpts (..) )
 import           Stack.Options.HpcReportParser ( pvpBoundsOption )
 
 -- | Parse command line arguments for Stack's @sdist@ and @upload@ commands.

diff --git a/src/Stack/Options/TestParser.hs b/src/Stack/Options/TestParser.hs
@@ -5,12 +5,13 @@ module Stack.Options.TestParser
   ) where
 
 import           Options.Applicative
-import           Options.Applicative.Args
+                   ( Parser, auto, flag', help, long, metavar, option )
+import           Options.Applicative.Args ( argsOption )
 import           Options.Applicative.Builder.Extra
-import           Stack.Options.Utils
+                   ( firstBoolFlagsTrue, optionalFirst, optionalFirstFalse )
+import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
 import           Stack.Types.BuildOpts ( TestOptsMonoid (..) )
-import           Stack.Types.Config ()
 
 -- | Parser for test arguments.
 -- FIXME hide args

diff --git a/src/Stack/Options/UploadParser.hs b/src/Stack/Options/UploadParser.hs
@@ -5,7 +5,7 @@ module Stack.Options.UploadParser
   ( uploadOptsParser
   ) where
 
-import           Options.Applicative
+import           Options.Applicative ( Parser, flag, help, long )
 import           Stack.Options.SDistParser ( sdistOptsParser )
 import           Stack.Prelude
 import           Stack.Upload ( UploadOpts (..), UploadVariant (..) )

diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -79,10 +79,7 @@ import           Stack.Types.Version
                    ( VersionRange, intersectVersionRanges, withinRange )
 import           System.FilePath ( replaceExtension )
 import           Stack.Types.Dependency ( DepValue (..), DepType (..) )
-import           Stack.Types.PackageFile
-                   ( DotCabalPath
-                   , GetPackageFiles (..)
-                   )
+import           Stack.Types.PackageFile ( DotCabalPath , GetPackageFiles (..) )
 import           Stack.PackageFile ( getPackageFile )
 
 -- | Read @<package>.buildinfo@ ancillary files produced by some Setup.hs hooks.

diff --git a/src/Stack/Setup/Installed.hs b/src/Stack/Setup/Installed.hs
@@ -27,12 +27,16 @@ import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 import           Distribution.System ( Platform (..) )
 import qualified Distribution.System as Cabal
-import           Path
-import           Path.IO
-import           RIO.Process
+import           Path ( (</>), filename, parseRelDir, parseRelFile )
+import           Path.IO ( doesDirExist, ignoringAbsence, listDir, removeFile )
+import           RIO.Process ( HasProcessContext, proc, readProcess_ )
 import           Stack.Constants
+                   ( relDirBin, relDirInclude, relDirLib, relDirLocal, relDirMingw
+                   , relDirMingw32, relDirMingw64, relDirUsr
+                   )
 import           Stack.Prelude
 import           Stack.Types.Compiler
+                   ( ActualCompiler (..), WhichCompiler (..) )
 import           Stack.Types.Config ( Config (..), HasConfig (..) )
 import           Stack.Types.ExtraDirs ( ExtraDirs (..) )
 

diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs
@@ -31,7 +31,6 @@ import           Database.Persist.TH
                    , sqlSettings
                    )
 import qualified Pantry.Internal as SQLite
-import           Path (  )
 import           Stack.Prelude
 import           Stack.Storage.Util
                    ( handleMigrationException, updateList, updateSet )

diff --git a/src/Stack/Types/DumpPackage.hs b/src/Stack/Types/DumpPackage.hs
@@ -7,7 +7,7 @@ module Stack.Types.DumpPackage
 import qualified Distribution.License as C
 import           Distribution.ModuleName ( ModuleName )
 import           Stack.Prelude
-import           Stack.Types.GhcPkgId
+import           Stack.Types.GhcPkgId ( GhcPkgId )
 
 -- | Type representing dump information for a single package, as output by the
 -- @ghc-pkg describe@ command.