refactor(cabal-install): reduce scope in ProjectPlanning

Author: andreabedini

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

@@ -1808,40 +1808,26 @@ elaborateInstallPlan
                     , elabPkgOrComp =
                         ElabComponent
                           ( ElaboratedComponent
-                              { compSolverName
-                              , compComponentName
-                              , compLibDependencies
-                              , compLinkedLibDependencies
-                              , compExeDependencies
-                              , compPkgConfigDependencies
-                              , compExeDependencyPaths
-                              , compOrderLibDependencies
-                              , compInstantiatedWith
-                              , compLinkedInstantiatedWith
+                              { compSolverName = CD.ComponentSetup
+                              , compComponentName = Nothing
+                              , compLibDependencies =
+                                  [ (configuredId cid, False)
+                                  | cid <- CD.setupDeps solverPkgLibDeps >>= elaborateLibSolverId mapDep
+                                  ]
+                              , compLinkedLibDependencies = notImpl "compLinkedLibDependencies"
+                              , compOrderLibDependencies = notImpl "compOrderLibDependencies"
+                              , -- Not supported:
+                                compExeDependencies = mempty
+                              , compExeDependencyPaths = mempty
+                              , compPkgConfigDependencies = mempty
+                              , compInstantiatedWith = mempty
+                              , compLinkedInstantiatedWith = Map.empty
                               }
                           )
                     }
             | otherwise =
                 Nothing
             where
-              compSolverName = CD.ComponentSetup
-              compComponentName = Nothing
-
-              dep_pkgs = elaborateLibSolverId mapDep =<< CD.setupDeps solverPkgLibDeps
-
-              compLibDependencies =
-                -- MP: No idea what this function does
-                map (\cid -> (configuredId cid, False)) dep_pkgs
-              compLinkedLibDependencies = notImpl "compLinkedLibDependencies"
-              compOrderLibDependencies = notImpl "compOrderLibDependencies"
-
-              -- Not supported:
-              compExeDependencies = []
-              compExeDependencyPaths = []
-              compPkgConfigDependencies = []
-              compInstantiatedWith = mempty
-              compLinkedInstantiatedWith = Map.empty
-
               notImpl f =
                 error $
                   "Distribution.Client.ProjectPlanning.setupComponent: "
@@ -1945,13 +1931,14 @@ elaborateInstallPlan
                         { compSolverName
                         , compComponentName
                         , compLibDependencies
-                        , compLinkedLibDependencies
                         , compExeDependencies
                         , compPkgConfigDependencies
                         , compExeDependencyPaths
-                        , compOrderLibDependencies
                         , compInstantiatedWith = Map.empty
                         , compLinkedInstantiatedWith = Map.empty
+                        , -- filled later (in step 5)
+                          compLinkedLibDependencies = error "buildComponent: compLinkedLibDependencies"
+                        , compOrderLibDependencies = error "buildComponent: compOrderLibDependencies"
                         }
 
                 -- 3. Construct a preliminary ElaboratedConfiguredPackage,
@@ -2043,9 +2030,6 @@ elaborateInstallPlan
 
                 return ((cc_map', lc_map', exe_map'), elab)
             where
-              compLinkedLibDependencies = error "buildComponent: compLinkedLibDependencies"
-              compOrderLibDependencies = error "buildComponent: compOrderLibDependencies"
-
               cname = Cabal.componentName comp
               compComponentName = Just cname
               compSolverName = CD.componentNameToComponent cname