refactor!: remove independent goals

remove independent goals

Author: andreabedini

cabal-install-solver/src/Distribution/Solver/Modular/Builder.hs

@@ -35,7 +35,6 @@ import qualified Distribution.Solver.Modular.WeightedPSQ as W
 
 import Distribution.Solver.Types.ComponentDeps
 import Distribution.Solver.Types.PackagePath
-import Distribution.Solver.Types.Settings
 
 -- | All state needed to build and link the search tree. It has a type variable
 -- because the linking phase doesn't need to know about the state used to build
@@ -246,8 +245,8 @@ alreadyLinked = error "addLinking called on tree that already contains linked no
 
 -- | Interface to the tree builder. Just takes an index and a list of package names,
 -- and computes the initial state and then the tree from there.
-buildTree :: Index -> IndependentGoals -> [PN] -> Tree () QGoalReason
-buildTree idx (IndependentGoals ind) igs =
+buildTree :: Index -> [PN] -> Tree () QGoalReason
+buildTree idx igs =
     build Linker {
         buildState = BS {
             index = idx
@@ -260,8 +259,7 @@ buildTree idx (IndependentGoals ind) igs =
   where
     topLevelGoal qpn = PkgGoal qpn UserGoal
 
-    qpns | ind       = L.map makeIndependent igs
-         | otherwise = L.map (Q (PackagePath DefaultNamespace QualToplevel)) igs
+    qpns = L.map (Q (PackagePath QualToplevel)) igs
 
 {-------------------------------------------------------------------------------
   Goals

cabal-install-solver/src/Distribution/Solver/Modular/ConfiguredConversion.hs

@@ -55,7 +55,7 @@ convPI (PI _ (I _ (Inst pi))) = Left pi
 convPI pi                     = Right (packageId (either id id (convConfId pi)))
 
 convConfId :: PI QPN -> Either SolverId {- is lib -} SolverId {- is exe -}
-convConfId (PI (Q (PackagePath _ q) pn) (I v loc)) =
+convConfId (PI (Q (PackagePath q) pn) (I v loc)) =
     case loc of
         Inst pi -> Left (PreExistingId sourceId pi)
         _otherwise

cabal-install-solver/src/Distribution/Solver/Modular/Dependency.hs

@@ -166,7 +166,7 @@ showDependencyReason (DependencyReason qpn flags stanzas) =
 -- NOTE: It's the _dependencies_ of a package that may or may not be independent
 -- from the package itself. Package flag choices must of course be consistent.
 qualifyDeps :: QPN -> FlaggedDeps PN -> FlaggedDeps QPN
-qualifyDeps (Q pp@(PackagePath ns q) pn) = go
+qualifyDeps (Q pp@(PackagePath q) pn) = go
   where
     go :: FlaggedDeps PN -> FlaggedDeps QPN
     go = map go1
@@ -192,10 +192,10 @@ qualifyDeps (Q pp@(PackagePath ns q) pn) = go
     goD (Lang lang) _ = Lang lang
     goD (Pkg pkn vr) _ = Pkg pkn vr
     goD (Dep dep@(PkgComponent qpn (ExposedExe _)) ci) _ =
-      Dep (Q (PackagePath ns (QualExe pn qpn)) <$> dep) ci
+      Dep (Q (PackagePath (QualExe pn qpn)) <$> dep) ci
     goD (Dep dep@(PkgComponent _qpn (ExposedLib _)) ci) comp
-      | comp == ComponentSetup = Dep (Q (PackagePath ns (QualSetup pn)) <$> dep) ci
-      | otherwise = Dep (Q (PackagePath ns inheritedQ) <$> dep) ci
+      | comp == ComponentSetup = Dep (Q (PackagePath (QualSetup pn)) <$> dep) ci
+      | otherwise = Dep (Q (PackagePath inheritedQ) <$> dep) ci
 
     -- If P has a setup dependency on Q, and Q has a regular dependency on R, then
     -- we say that the 'Setup' qualifier is inherited: P has an (indirect) setup

cabal-install-solver/src/Distribution/Solver/Modular/Package.hs

@@ -10,7 +10,6 @@ module Distribution.Solver.Modular.Package
   , PN
   , QPV
   , instI
-  , makeIndependent
   , showI
   , showPI
   , unPN
@@ -74,8 +73,3 @@ showPI (PI qpn i) = showQPN qpn ++ "-" ++ showI i
 instI :: I -> Bool
 instI (I _ (Inst _)) = True
 instI _              = False
-
--- | Qualify a target package with its own name so that its dependencies are not
--- required to be consistent with other targets.
-makeIndependent :: PN -> QPN
-makeIndependent pn = Q (PackagePath (Independent pn) QualToplevel) pn

cabal-install-solver/src/Distribution/Solver/Modular/Preference.hs

@@ -420,8 +420,8 @@ deferSetupExeChoices = go
     go x                    = x
 
     noSetupOrExe :: Goal QPN -> Bool
-    noSetupOrExe (Goal (P (Q (PackagePath _ns (QualSetup _)) _)) _) = False
-    noSetupOrExe (Goal (P (Q (PackagePath _ns (QualExe _ _)) _)) _) = False
+    noSetupOrExe (Goal (P (Q (PackagePath (QualSetup _)) _)) _) = False
+    noSetupOrExe (Goal (P (Q (PackagePath (QualExe _ _)) _)) _) = False
     noSetupOrExe _                                                  = True
 
 -- | Transformation that tries to avoid making weak flag choices early.

cabal-install-solver/src/Distribution/Solver/Modular/Solver.hs

@@ -62,7 +62,6 @@ data SolverConfig = SolverConfig {
   countConflicts         :: CountConflicts,
   fineGrainedConflicts   :: FineGrainedConflicts,
   minimizeConflictSet    :: MinimizeConflictSet,
-  independentGoals       :: IndependentGoals,
   avoidReinstalls        :: AvoidReinstalls,
   shadowPkgs             :: ShadowPkgs,
   strongFlags            :: StrongFlags,
@@ -144,7 +143,8 @@ solve sc cinfo idx pkgConfigDB userPrefs userConstraints userGoals =
                             P.onlyConstrained pkgIsExplicit
                           OnlyConstrainedNone ->
                             id)
-    buildPhase       = buildTree idx (independentGoals sc) (S.toList userGoals)
+
+    buildPhase       = buildTree idx (S.toList userGoals)
 
     allExplicit = M.keysSet userConstraints `S.union` userGoals
 
@@ -250,5 +250,5 @@ _removeGR = trav go
    dummy =
        DependencyGoal $
        DependencyReason
-           (Q (PackagePath DefaultNamespace QualToplevel) (mkPackageName "$"))
+           (Q (PackagePath QualToplevel) (mkPackageName "$"))
            M.empty S.empty

cabal-install-solver/src/Distribution/Solver/Types/PackageConstraint.hs

@@ -68,15 +68,13 @@ scopeToPackageName (ScopeAnySetupQualifier pn) = pn
 scopeToPackageName (ScopeAnyQualifier pn) = pn
 
 constraintScopeMatches :: ConstraintScope -> QPN -> Bool
-constraintScopeMatches (ScopeTarget pn) (Q (PackagePath ns q) pn') =
-  let namespaceMatches DefaultNamespace = True
-      namespaceMatches (Independent namespacePn) = pn == namespacePn
-  in namespaceMatches ns && q == QualToplevel && pn == pn'
-constraintScopeMatches (ScopeQualified q pn) (Q (PackagePath _ q') pn') =
+constraintScopeMatches (ScopeTarget pn) (Q (PackagePath q) pn') =
+    q == QualToplevel && pn == pn'
+constraintScopeMatches (ScopeQualified q pn) (Q (PackagePath q') pn') =
     q == q' && pn == pn'
 constraintScopeMatches (ScopeAnySetupQualifier pn) (Q pp pn') =
-  let setup (PackagePath _ (QualSetup _)) = True
-      setup _                             = False
+  let setup (PackagePath (QualSetup _)) = True
+      setup _                           = False
   in setup pp && pn == pn'
 constraintScopeMatches (ScopeAnyQualifier pn) (Q _ pn') = pn == pn'
 

cabal-install-solver/src/Distribution/Solver/Types/PackagePath.hs

@@ -1,6 +1,5 @@
 module Distribution.Solver.Types.PackagePath
     ( PackagePath(..)
-    , Namespace(..)
     , Qualifier(..)
     , dispQualifier
     , Qualified(..)
@@ -15,29 +14,9 @@ import Distribution.Package (PackageName)
 import Distribution.Pretty (pretty, flatStyle)
 import qualified Text.PrettyPrint as Disp
 
--- | A package path consists of a namespace and a package path inside that
--- namespace.
-data PackagePath = PackagePath Namespace Qualifier
+data PackagePath = PackagePath Qualifier
   deriving (Eq, Ord, Show)
 
--- | Top-level namespace
---
--- Package choices in different namespaces are considered completely independent
--- by the solver.
-data Namespace =
-    -- | The default namespace
-    DefaultNamespace
-
-    -- | A namespace for a specific build target
-  | Independent PackageName
-  deriving (Eq, Ord, Show)
-
--- | Pretty-prints a namespace. The result is either empty or
--- ends in a period, so it can be prepended onto a qualifier.
-dispNamespace :: Namespace -> Disp.Doc
-dispNamespace DefaultNamespace = Disp.empty
-dispNamespace (Independent i) = pretty i <<>> Disp.text "."
-
 -- | Qualifier of a package within a namespace (see 'PackagePath')
 data Qualifier =
     -- | Top-level dependency in this namespace
@@ -82,8 +61,8 @@ type QPN = Qualified PackageName
 
 -- | Pretty-prints a qualified package name.
 dispQPN :: QPN -> Disp.Doc
-dispQPN (Q (PackagePath ns qual) pn) =
-  dispNamespace ns <<>> dispQualifier qual <<>> pretty pn
+dispQPN (Q (PackagePath qual) pn) =
+  dispQualifier qual <<>> pretty pn
 
 -- | String representation of a qualified package name.
 showQPN :: QPN -> String

cabal-install-solver/src/Distribution/Solver/Types/Settings.hs

@@ -2,7 +2,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 module Distribution.Solver.Types.Settings
     ( ReorderGoals(..)
-    , IndependentGoals(..)
     , PreferOldest(..)
     , MinimizeConflictSet(..)
     , AvoidReinstalls(..)
@@ -38,9 +37,6 @@ newtype FineGrainedConflicts = FineGrainedConflicts Bool
 newtype MinimizeConflictSet = MinimizeConflictSet Bool
   deriving (BooleanFlag, Eq, Generic, Show)
 
-newtype IndependentGoals = IndependentGoals Bool
-  deriving (BooleanFlag, Eq, Generic, Show)
-
 newtype PreferOldest = PreferOldest Bool
   deriving (BooleanFlag, Eq, Generic, Show)
 
@@ -72,7 +68,6 @@ newtype SolveExecutables = SolveExecutables Bool
 instance Binary ReorderGoals
 instance Binary CountConflicts
 instance Binary FineGrainedConflicts
-instance Binary IndependentGoals
 instance Binary PreferOldest
 instance Binary MinimizeConflictSet
 instance Binary AvoidReinstalls
@@ -85,7 +80,6 @@ instance Binary SolveExecutables
 instance Structured ReorderGoals
 instance Structured CountConflicts
 instance Structured FineGrainedConflicts
-instance Structured IndependentGoals
 instance Structured PreferOldest
 instance Structured MinimizeConflictSet
 instance Structured AvoidReinstalls

cabal-install/src/Distribution/Client/Config.hs

@@ -423,7 +423,6 @@ instance Semigroup SavedConfig where
           , installCountConflicts = combine installCountConflicts
           , installFineGrainedConflicts = combine installFineGrainedConflicts
           , installMinimizeConflictSet = combine installMinimizeConflictSet
-          , installIndependentGoals = combine installIndependentGoals
           , installPreferOldest = combine installPreferOldest
           , installShadowPkgs = combine installShadowPkgs
           , installStrongFlags = combine installStrongFlags