Skip to content

Commit 5d475b0

Browse files
Remove top-down resolver
Removing 'topdown' as a resolver choice means that 'choose' is also obsolete and so it is removed too.
1 parent 5944c3e commit 5d475b0

File tree

8 files changed

+7
-1832
lines changed

8 files changed

+7
-1832
lines changed

cabal-install/Distribution/Client/Dependency.hs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ module Distribution.Client.Dependency (
6565
addDefaultSetupDependencies,
6666
) where
6767

68-
import Distribution.Client.Dependency.TopDown
69-
( topDownResolver )
7068
import Distribution.Solver.Modular
7169
( modularResolver, SolverConfig(..) )
7270
import Distribution.Simple.PackageIndex (InstalledPackageIndex)
@@ -104,7 +102,7 @@ import Distribution.System
104102
import Distribution.Client.Utils
105103
( duplicates, duplicatesBy, mergeBy, MergeResult(..) )
106104
import Distribution.Simple.Utils
107-
( comparing, warn, info )
105+
( comparing )
108106
import Distribution.Simple.Configure
109107
( relaxPackageDeps )
110108
import Distribution.Simple.Setup
@@ -610,19 +608,12 @@ applySandboxInstallPolicy
610608
-- ------------------------------------------------------------
611609

612610
chooseSolver :: Verbosity -> PreSolver -> CompilerInfo -> IO Solver
613-
chooseSolver verbosity preSolver _cinfo =
611+
chooseSolver _verbosity preSolver _cinfo =
614612
case preSolver of
615-
AlwaysTopDown -> do
616-
warn verbosity "Topdown solver is deprecated"
617-
return TopDown
618613
AlwaysModular -> do
619614
return Modular
620-
Choose -> do
621-
info verbosity "Choosing modular solver."
622-
return Modular
623615

624616
runSolver :: Solver -> SolverConfig -> DependencyResolver UnresolvedPkgLoc
625-
runSolver TopDown = const topDownResolver -- TODO: warn about unsupported options
626617
runSolver Modular = modularResolver
627618

628619
-- | Run the dependency solver.

0 commit comments

Comments
 (0)