move elabInstantiatedWith and elabLinkedInstantiatedWith from ElaboratedConfiguredPackage to

ElaboratedComponent

Author: andreabedini

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

@@ -987,25 +987,25 @@ printPlan
             , case elabPkgOrComp elab of
                 ElabPackage pkg -> showTargets elab ++ ifVerbose (showStanzas (pkgStanzasEnabled pkg))
                 ElabComponent comp ->
-                  "(" ++ showComp elab comp ++ ")"
+                  "(" ++ showComp comp ++ ")"
             , showFlagAssignment (nonDefaultFlags elab)
             , showConfigureFlags elab
             , let buildStatus = pkgsBuildStatus Map.! installedUnitId elab
                in "(" ++ showBuildStatus buildStatus ++ ")"
             ]
 
-      showComp :: ElaboratedConfiguredPackage -> ElaboratedComponent -> String
-      showComp elab comp =
+      showComp :: ElaboratedComponent -> String
+      showComp comp =
         maybe "custom" prettyShow (compComponentName comp)
-          ++ if Map.null (elabInstantiatedWith elab)
+          ++ if Map.null (compInstantiatedWith comp)
             then ""
             else
               " with "
                 ++ intercalate
                   ", "
                   -- TODO: Abbreviate the UnitIds
                   [ prettyShow k ++ "=" ++ prettyShow v
-                  | (k, v) <- Map.toList (elabInstantiatedWith elab)
+                  | (k, v) <- Map.toList (compInstantiatedWith comp)
                   ]
 
       nonDefaultFlags :: ElaboratedConfiguredPackage -> FlagAssignment

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

@@ -1728,7 +1728,6 @@ elaborateInstallPlan
                     { elabModuleShape = emptyModuleShape
                     , elabUnitId = notImpl "elabUnitId"
                     , elabComponentId = notImpl "elabComponentId"
-                    , elabLinkedInstantiatedWith = Map.empty
                     , elabInstallDirs = notImpl "elabInstallDirs"
                     , elabPkgOrComp = ElabComponent (ElaboratedComponent{..})
                     }
@@ -1747,14 +1746,11 @@ elaborateInstallPlan
               compOrderLibDependencies = notImpl "compOrderLibDependencies"
 
               -- Not supported:
-              compExeDependencies :: [a]
               compExeDependencies = []
-
-              compExeDependencyPaths :: [a]
               compExeDependencyPaths = []
-
-              compPkgConfigDependencies :: [a]
-              compPkgConfigDependencies = []
+              compPkgConfigDependencies = []  
+              compInstantiatedWith = mempty
+              compLinkedInstantiatedWith = Map.empty
 
               notImpl f =
                 error $
@@ -1812,6 +1808,8 @@ elaborateInstallPlan
                       , Just paths <- [Map.lookup (ann_id aid') exe_map1]
                       , path <- paths
                       ]
+                    compInstantiatedWith = Map.empty
+                    compLinkedInstantiatedWith = Map.empty
                     elab_comp = ElaboratedComponent{..}
 
                 -- 3. Construct a preliminary ElaboratedConfiguredPackage,
@@ -1867,7 +1865,6 @@ elaborateInstallPlan
                       { elabModuleShape = lc_shape lc
                       , elabUnitId = abstractUnitId (lc_uid lc)
                       , elabComponentId = lc_cid lc
-                      , elabLinkedInstantiatedWith = Map.fromList (lc_insts lc)
                       , elabPkgOrComp =
                           ElabComponent $
                             elab_comp
@@ -1878,6 +1875,7 @@ elaborateInstallPlan
                                         (abstractUnitId . ci_id)
                                         (lc_includes lc ++ lc_sig_includes lc)
                                     )
+                              , compLinkedInstantiatedWith = Map.fromList (lc_insts lc)
                               }
                       }
                   elab =
@@ -2031,7 +2029,6 @@ elaborateInstallPlan
               elab0
                 { elabUnitId = newSimpleUnitId pkgInstalledId
                 , elabComponentId = pkgInstalledId
-                , elabLinkedInstantiatedWith = Map.empty
                 , elabPkgOrComp = ElabPackage $ ElaboratedPackage{..}
                 , elabModuleShape = modShape
                 }
@@ -2128,8 +2125,6 @@ elaborateInstallPlan
             -- These get filled in later
             elabUnitId = error "elaborateSolverToCommon: elabUnitId"
             elabComponentId = error "elaborateSolverToCommon: elabComponentId"
-            elabInstantiatedWith = Map.empty
-            elabLinkedInstantiatedWith = error "elaborateSolverToCommon: elabLinkedInstantiatedWith"
             elabPkgOrComp = error "elaborateSolverToCommon: elabPkgOrComp"
             elabInstallDirs = error "elaborateSolverToCommon: elabInstallDirs"
             elabModuleShape = error "elaborateSolverToCommon: elabModuleShape"
@@ -2733,7 +2728,6 @@ instantiateInstallPlan storeDirLayout defaultInstallDirs elaboratedShared plan =
                         elab0
                           { elabUnitId = uid
                           , elabComponentId = cid
-                          , elabInstantiatedWith = fmap fst insts
                           , elabIsCanonical = Map.null (fmap fst insts)
                           , elabPkgOrComp =
                               ElabComponent
@@ -2745,6 +2739,7 @@ instantiateInstallPlan storeDirLayout defaultInstallDirs elaboratedShared plan =
                                               unDefUnitId
                                               (deps ++ concatMap (getDep . fst) (Map.elems insts))
                                           )
+                                  , compInstantiatedWith = fmap fst insts
                                   }
                           }
                     elab =
@@ -2856,8 +2851,8 @@ instantiateInstallPlan storeDirLayout defaultInstallDirs elaboratedShared plan =
 
     work = for_ pkgs $ \pkg ->
       case pkg of
-        InstallPlan.Configured elab
-          | not (Map.null (elabLinkedInstantiatedWith elab)) ->
+        InstallPlan.Configured (elab@ElaboratedConfiguredPackage{elabPkgOrComp=ElabComponent comp})
+          | not (Map.null (compLinkedInstantiatedWith comp)) ->
               indefiniteUnitId (elabComponentId elab)
                 >> return ()
         _ ->
@@ -3939,7 +3934,9 @@ setupHsConfigureFlags
       configProfExe = mempty
       configProf = toFlag $ LBC.withProfExe elabBuildOptions
 
-      configInstantiateWith = Map.toList elabInstantiatedWith
+      configInstantiateWith = case elabPkgOrComp of
+        ElabPackage _ -> mempty
+        ElabComponent comp -> Map.toList (compInstantiatedWith comp)
 
       configDeterministic = mempty -- doesn't matter, configIPID/configCID overridese
       configIPID = case elabPkgOrComp of

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

@@ -213,8 +213,6 @@ data ElaboratedConfiguredPackage = ElaboratedConfiguredPackage
   { elabUnitId :: UnitId
   -- ^ The 'UnitId' which uniquely identifies this item in a build plan
   , elabComponentId :: ComponentId
-  , elabInstantiatedWith :: Map ModuleName Module
-  , elabLinkedInstantiatedWith :: Map ModuleName OpenModule
   , elabIsCanonical :: Bool
   -- ^ This is true if this is an indefinite package, or this is a
   -- package with no signatures.  (Notably, it's not true for instantiated
@@ -696,6 +694,8 @@ data ElaboratedComponent = ElaboratedComponent
   -- instantiation phase. It's more precise than
   -- 'compLibDependencies', and also stores information about internal
   -- dependencies.
+  , compInstantiatedWith :: Map ModuleName Module
+  , compLinkedInstantiatedWith :: Map ModuleName OpenModule
   , compExeDependencies :: [ConfiguredId]
   -- ^ The executable dependencies of this component (including
   -- internal executables).