don't expose intemediary accessors

Author: leana8959

Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs

@@ -319,11 +319,11 @@ extractConditions
   -> [Condition ConfVar]
 extractConditions f gpkg =
   concat
-    [ extractCondition (f . libBuildInfo) <$> maybeToList (condLibrary' gpkg)
-    , extractCondition (f . libBuildInfo) . snd <$> condSubLibraries' gpkg
-    , extractCondition (f . buildInfo) . snd <$> condExecutables' gpkg
-    , extractCondition (f . testBuildInfo) . snd <$> condTestSuites' gpkg
-    , extractCondition (f . benchmarkBuildInfo) . snd <$> condBenchmarks' gpkg
+    [ extractCondition (f . libBuildInfo) <$> maybeToList (condLibrary gpkg)
+    , extractCondition (f . libBuildInfo) . snd <$> condSubLibraries gpkg
+    , extractCondition (f . buildInfo) . snd <$> condExecutables gpkg
+    , extractCondition (f . testBuildInfo) . snd <$> condTestSuites gpkg
+    , extractCondition (f . benchmarkBuildInfo) . snd <$> condBenchmarks gpkg
     ]
 
 freeVars :: CondTree ConfVar c a -> [FlagName]

Cabal-syntax/src/Distribution/PackageDescription/PrettyPrint.hs

@@ -79,12 +79,12 @@ ppGenericPackageDescription v gpd0 =
     [ ppPackageDescription v (packageDescription gpd)
     , ppSetupBInfo v (setupBuildInfo (packageDescription gpd))
     , ppGenPackageFlags v (genPackageFlags gpd)
-    , ppCondLibrary v (condLibrary' gpd)
-    , ppCondSubLibraries v (condSubLibraries' gpd)
-    , ppCondForeignLibs v (condForeignLibs' gpd)
-    , ppCondExecutables v (condExecutables' gpd)
-    , ppCondTestSuites v (condTestSuites' gpd)
-    , ppCondBenchmarks v (condBenchmarks' gpd)
+    , ppCondLibrary v (condLibrary gpd)
+    , ppCondSubLibraries v (condSubLibraries gpd)
+    , ppCondForeignLibs v (condForeignLibs gpd)
+    , ppCondExecutables v (condExecutables gpd)
+    , ppCondTestSuites v (condTestSuites gpd)
+    , ppCondBenchmarks v (condBenchmarks gpd)
     ]
   where
     gpd = preProcessInternalDeps (specVersion (packageDescription gpd0)) gpd0

Cabal-syntax/src/Distribution/Types/GenericPackageDescription.hs

@@ -22,14 +22,6 @@ module Distribution.Types.GenericPackageDescription
   , condTestSuites
   , condBenchmarks
 
-    -- * Accessors
-  , condLibrary'
-  , condSubLibraries'
-  , condForeignLibs'
-  , condExecutables'
-  , condTestSuites'
-  , condBenchmarks'
-
     -- * Merging helpers
   , mergeCondLibrary
   , mergeCondSubLibraries

Cabal-tests/tests/ParserTests.hs

@@ -15,7 +15,7 @@ import Data.Algorithm.Diff                         (PolyDiff (..), getGroupedDif
 import Data.Maybe                                  (isNothing)
 import Distribution.Fields                         (pwarning)
 import Distribution.PackageDescription             (GenericPackageDescription)
-import Distribution.Types.GenericPackageDescription(condLibrary')
+import Distribution.Types.GenericPackageDescription(condLibrary)
 import Distribution.PackageDescription.Parsec      (parseGenericPackageDescription)
 import Distribution.PackageDescription.PrettyPrint (showGenericPackageDescription)
 import Distribution.Parsec                         (PWarnType (..), PWarning (..), showPErrorWithSource, showPWarningWithSource)
@@ -169,7 +169,7 @@ accessorsTests = testGroup "accessors"
 
 #ifdef MIN_VERSION_tree_diff
 accessorsGoldenTestCondLibrary :: [FilePath] -> TestTree
-accessorsGoldenTestCondLibrary = testGroup "condLibrary" . map (accessorsGoldenTest condLibrary')
+accessorsGoldenTestCondLibrary = testGroup "condLibrary" . map (accessorsGoldenTest condLibrary)
 
 accessorsGoldenTest
   :: ToExpr a

Cabal/src/Distribution/PackageDescription/Check.hs

@@ -273,7 +273,7 @@ checkGenericPackageDescription
       -- § Feature checks.
       checkSpecVer
         CabalSpecV2_0
-        (not . null $ condSubLibraries' gpd)
+        (not . null $ condSubLibraries_)
         (PackageDistInexcusable CVMultiLib)
       checkSpecVer
         CabalSpecV1_8
@@ -293,7 +293,7 @@ checkGenericPackageDescription
           )
       let ads =
             maybe [] ((: []) . extractAssocDeps pName) condLibrary_
-              ++ map (uncurry extractAssocDeps) (condSubLibraries' gpd)
+              ++ map (uncurry extractAssocDeps) condSubLibraries_
 
       case condLibrary_ of
         Just cl ->

Cabal/src/Distribution/PackageDescription/Check/Conditional.hs

@@ -228,10 +228,10 @@ checkCondVars cond =
 -- this particular check.
 checkDuplicateModules :: GenericPackageDescription -> [PackageCheck]
 checkDuplicateModules pkg =
-  concatMap checkLib (maybe id (:) (condLibrary' pkg) . map snd $ condSubLibraries' pkg)
-    ++ concatMap checkExe (map snd $ condExecutables' pkg)
-    ++ concatMap checkTest (map snd $ condTestSuites' pkg)
-    ++ concatMap checkBench (map snd $ condBenchmarks' pkg)
+  concatMap checkLib (maybe id (:) (condLibrary pkg) . map snd $ condSubLibraries pkg)
+    ++ concatMap checkExe (map snd $ condExecutables pkg)
+    ++ concatMap checkTest (map snd $ condTestSuites pkg)
+    ++ concatMap checkBench (map snd $ condBenchmarks pkg)
   where
     -- the duplicate modules check is has not been thoroughly vetted for backpack
     checkLib = checkDups "library" (\l -> explicitLibModules l ++ map moduleReexportName (reexportedModules l))

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

@@ -176,7 +176,7 @@ convGPD :: OS -> Arch -> CompilerInfo -> [LabeledPackageConstraint]
         -> StrongFlags -> SolveExecutables -> PN -> GenericPackageDescription
         -> PInfo
 convGPD os arch cinfo constraints strfl solveExes pn
-        gpd@(GenericPackageDescription pkg scannedVersion flags mlib sub_libs flibs exes tests benchs) =
+        (GenericPackageDescription pkg scannedVersion flags mlib sub_libs flibs exes tests benchs) =
   let
     fds  = flagInfo strfl flags
 
@@ -216,16 +216,16 @@ convGPD os arch cinfo constraints strfl solveExes pn
     components = M.fromList $ libComps ++ subLibComps ++ exeComps
       where
         libComps = [ (ExposedLib LMainLibName, libToComponentInfo lib)
-                   | lib <- maybeToList (condLibrary' gpd) ]
+                   | lib <- maybeToList mlib ]
         subLibComps = [ (ExposedLib (LSubLibName name), libToComponentInfo lib)
-                      | (name, lib) <- condSubLibraries' gpd  ]
+                      | (name, lib) <- sub_libs  ]
         exeComps = [ ( ExposedExe name
                      , ComponentInfo {
                            compIsVisible = IsVisible True
                          , compIsBuildable = IsBuildable $ testCondition (buildable . buildInfo) exe /= Just False
                          }
                      )
-                   | (name, exe) <- (condExecutables' gpd) ]
+                   | (name, exe) <- exes ]
 
         libToComponentInfo lib =
             ComponentInfo {