Simple refactoring

src/Stack/Build/ConstructPlan.hs

@@ -52,6 +52,7 @@ import           System.Environment (lookupEnv)
 import           System.IO (putStrLn)
 import           RIO.PrettyPrint
 import           RIO.Process (findExecutable, HasProcessContext (..))
+import           Stack.Types.Dependency (DepValue(DepValue), DepType (AsLibrary))
 
 data PackageInfo
     =
@@ -684,7 +685,8 @@ addEllipsis t
 addPackageDeps :: Package -> M (Either ConstructPlanException (Set PackageIdentifier, Map PackageIdentifier GhcPkgId, IsMutable))
 addPackageDeps package = do
     ctx <- ask
-    deps' <- packageDepsWithTools package
+    checkAndWarnForUnknownTools package
+    let deps' = packageDeps package
     deps <- forM (Map.toList deps') $ \(depname, DepValue range depType) -> do
         eres <- addDep depname
         let getLatestApplicableVersionAndRev :: M (Maybe (Version, BlobKey))
@@ -925,8 +927,8 @@ psLocation PSRemote{} = Snap
 
 -- | Get all of the dependencies for a given package, including build
 -- tool dependencies.
-packageDepsWithTools :: Package -> M (Map PackageName DepValue)
-packageDepsWithTools p = do
+checkAndWarnForUnknownTools :: Package -> M ()
+checkAndWarnForUnknownTools p = do
     -- Check whether the tool is on the PATH before warning about it.
     warnings <- fmap catMaybes $ forM (Set.toList $ packageUnknownTools p) $
       \name@(ExeName toolName) -> do
@@ -938,7 +940,7 @@ packageDepsWithTools p = do
             Left _ -> pure $ Just $ ToolWarning name (packageName p)
             Right _ -> pure Nothing
     tell mempty { wWarnings = (map toolWarningText warnings ++) }
-    pure $ packageDeps p
+    pure ()
 
 -- | Warn about tools in the snapshot definition. States the tool name
 -- expected and the package name using it.

src/Stack/Build/Haddock.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE NamedFieldPuns       #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
 
 -- | Generate haddocks
@@ -107,7 +107,7 @@ generateLocalHaddockIndex
 generateLocalHaddockIndex bco localDumpPkgs locals = do
     let dumpPackages =
             mapMaybe
-                (\LocalPackage{lpPackage = Package{..}} ->
+                (\LocalPackage{lpPackage = Package{packageName, packageVersion}} ->
                     F.find
                         (\dp -> dpPackageIdent dp == PackageIdentifier packageName packageVersion)
                         localDumpPkgs)
@@ -139,7 +139,7 @@ generateDepsHaddockIndex bco globalDumpPkgs snapshotDumpPkgs localDumpPkgs local
         depDocDir
   where
     getGhcPkgId :: LocalPackage -> Maybe GhcPkgId
-    getGhcPkgId LocalPackage{lpPackage = Package{..}} =
+    getGhcPkgId LocalPackage{lpPackage = Package{packageName, packageVersion}} =
         let pkgId = PackageIdentifier packageName packageVersion
             mdpPkg = F.find (\dp -> dpPackageIdent dp == pkgId) localDumpPkgs
         in fmap dpGhcPkgId mdpPkg
@@ -219,7 +219,7 @@ generateHaddockIndex descr bco dumpPackages docRelFP destDir = do
                 fromString (toFilePath destIndexFile)
   where
     toInterfaceOpt :: DumpPackage -> IO (Maybe ([String], UTCTime, Path Abs File, Path Abs File))
-    toInterfaceOpt DumpPackage {..} =
+    toInterfaceOpt DumpPackage {dpHaddockInterfaces, dpPackageIdent, dpHaddockHtml} =
         case dpHaddockInterfaces of
             [] -> pure Nothing
             srcInterfaceFP:_ -> do

src/Stack/Build/Source.hs

@@ -315,25 +315,13 @@ loadLocalPackage pp = do
             { packageConfigEnableTests = not $ Set.null tests
             , packageConfigEnableBenchmarks = not $ Set.null benches
             }
-        testconfig = config
-            { packageConfigEnableTests = True
-            , packageConfigEnableBenchmarks = False
-            }
-        benchconfig = config
-            { packageConfigEnableTests = False
-            , packageConfigEnableBenchmarks = True
-            }
 
-        -- We resolve the package in 4 different configurations:
+        -- We resolve the package in 2 different configurations:
         --
         -- - pkg doesn't have tests or benchmarks enabled.
         --
         -- - btpkg has them enabled if they are present.
         --
-        -- - testpkg has tests enabled, but not benchmarks.
-        --
-        -- - benchpkg has benchmarks enabled, but not tests.
-        --
         -- The latter two configurations are used to compute the deps
         -- when --enable-benchmarks or --enable-tests are configured.
         -- This allows us to do an optimization where these are passed
@@ -343,8 +331,6 @@ loadLocalPackage pp = do
         btpkg
             | Set.null tests && Set.null benches = Nothing
             | otherwise = Just (resolvePackage btconfig gpkg)
-        testpkg = resolvePackage testconfig gpkg
-        benchpkg = resolvePackage benchconfig gpkg
 
     componentFiles <- memoizeRefWith $ fst <$> getPackageFilesForTargets pkg (ppCabalFP pp) nonLibComponents
 
@@ -372,8 +358,6 @@ loadLocalPackage pp = do
 
     pure LocalPackage
         { lpPackage = pkg
-        , lpTestDeps = dvVersionRange <$> packageDeps testpkg
-        , lpBenchDeps = dvVersionRange <$> packageDeps benchpkg
         , lpTestBench = btpkg
         , lpComponentFiles = componentFiles
         , lpBuildHaddocks = cpHaddocks (ppCommon pp)

src/Stack/Package.hs

@@ -77,6 +77,7 @@ import           System.IO.Error
 import           RIO.Process
 import           RIO.PrettyPrint
 import qualified RIO.PrettyPrint as PP (Style (Module))
+import           Stack.Types.Dependency (DepValue(..), DepType (..))
 
 data Ctx = Ctx { ctxFile :: !(Path Abs File)
                , ctxDistDir :: !(Path Abs Dir)
@@ -143,7 +144,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg
     , packageFlags = packageConfigFlags packageConfig
     , packageDefaultFlags = M.fromList
       [(flagName flag, flagDefault flag) | flag <- pkgFlags]
-    , packageAllDeps = S.fromList (M.keys deps)
+    , packageAllDeps = M.keysSet deps
     , packageLibraries =
         let mlib = do
               lib <- library pkg

src/Stack/SDist.hs

@@ -322,8 +322,6 @@ readLocalPackage pkgDir = do
         , lpCabalFile = cabalfp
         -- NOTE: these aren't the 'correct values, but aren't used in
         -- the usage of this function in this module.
-        , lpTestDeps = Map.empty
-        , lpBenchDeps = Map.empty
         , lpTestBench = Nothing
         , lpBuildHaddocks = False
         , lpForceDirty = False

src/Stack/Types/Dependency.hs

@@ -0,0 +1,33 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+module Stack.Types.Dependency
+  (DepValue(..)
+  ,DepType(..)
+  )
+  where
+
+import Stack.Prelude
+import Distribution.Types.VersionRange (VersionRange)
+import Stack.Types.Version (intersectVersionRanges)
+
+
+-- | The value for a map from dependency name. This contains both the
+-- version range and the type of dependency, and provides a semigroup
+-- instance.
+data DepValue = DepValue
+  { dvVersionRange :: !VersionRange
+  , dvType :: !DepType
+  }
+  deriving (Show, Typeable)
+instance Semigroup DepValue where
+  DepValue a x <> DepValue b y = DepValue (intersectVersionRanges a b) (x <> y)
+
+-- | Is this package being used as a library, or just as a build tool?
+-- If the former, we need to ensure that a library actually
+-- exists. See
+-- <https://github.com/commercialhaskell/stack/issues/2195>
+data DepType = AsLibrary | AsBuildTool
+  deriving (Show, Eq)
+instance Semigroup DepType where
+  AsLibrary <> _ = AsLibrary
+  AsBuildTool <> x = x

src/Stack/Types/Package.hs

@@ -29,6 +29,7 @@ import           Stack.Types.GhcPkgId
 import           Stack.Types.NamedComponent
 import           Stack.Types.SourceMap
 import           Stack.Types.Version
+import Stack.Types.Dependency (DepValue)
 
 -- | Type representing exceptions thrown by functions exported by the
 -- "Stack.Package" module.
@@ -139,27 +140,6 @@ data Package =
 packageIdent :: Package -> PackageIdentifier
 packageIdent p = PackageIdentifier (packageName p) (packageVersion p)
 
--- | The value for a map from dependency name. This contains both the
--- version range and the type of dependency, and provides a semigroup
--- instance.
-data DepValue = DepValue
-  { dvVersionRange :: !VersionRange
-  , dvType :: !DepType
-  }
-  deriving (Show,Typeable)
-instance Semigroup DepValue where
-  DepValue a x <> DepValue b y = DepValue (intersectVersionRanges a b) (x <> y)
-
--- | Is this package being used as a library, or just as a build tool?
--- If the former, we need to ensure that a library actually
--- exists. See
--- <https://github.com/commercialhaskell/stack/issues/2195>
-data DepType = AsLibrary | AsBuildTool
-  deriving (Show, Eq)
-instance Semigroup DepType where
-  AsLibrary <> _ = AsLibrary
-  AsBuildTool <> x = x
-
 packageIdentifier :: Package -> PackageIdentifier
 packageIdentifier pkg =
     PackageIdentifier (packageName pkg) (packageVersion pkg)
@@ -197,11 +177,6 @@ data BuildInfoOpts = BuildInfoOpts
     , bioCabalMacros :: Path Abs File
     } deriving Show
 
--- | Files to get for a cabal package.
-data CabalFileType
-    = AllFiles
-    | Modules
-
 -- | Files that the package depends on, relative to package directory.
 -- Argument is the location of the Cabal file
 newtype GetPackageFiles = GetPackageFiles
@@ -283,11 +258,6 @@ data LocalPackage = LocalPackage
     -- "buildable: false".
     , lpWanted        :: !Bool -- FIXME Should completely drop this "wanted" terminology, it's unclear
     -- ^ Whether this package is wanted as a target.
-    , lpTestDeps      :: !(Map PackageName VersionRange)
-    -- ^ Used for determining if we can use --enable-tests in a normal build.
-    , lpBenchDeps     :: !(Map PackageName VersionRange)
-    -- ^ Used for determining if we can use --enable-benchmarks in a normal
-    -- build.
     , lpTestBench     :: !(Maybe Package)
     -- ^ This stores the 'Package' with tests and benchmarks enabled, if
     -- either is asked for by the user.

stack.cabal

@@ -220,6 +220,7 @@ library
   other-modules:
       Path.Extended
       Stack.Types.Cache
+      Stack.Types.Dependency
   autogen-modules:
       Paths_stack
   hs-source-dirs: