Rename Package into Unit

The terminology changed over time and now package databases contain
"units" (there can be several units compiled from a single Cabal
package: one per-component, one for each option set, one per
instantiation, etc.). We should try to be consistent internally and use
"units": that's what this renaming does. Maybe one day we'll fix the UI
too (e.g. replace -package-id with -unit-id, we already have
-this-unit-id and ghc-pkg has -unit-id...) but it's not done in this
patch.

* rename getPkgFrameworkOpts into getUnitFrameworkOpts
* rename UnitInfoMap into ClosureUnitInfoMap
* rename InstalledPackageIndex into UnitInfoMap
* rename UnusablePackages into UnusableUnits
* rename PackagePrecedenceIndex into UnitPrecedenceMap
* rename PackageDatabase into UnitDatabase
* rename pkgDatabase into unitDatabases
* rename pkgState into unitState
* rename initPackages into initUnits
* rename renamePackage into renameUnitInfo
* rename UnusablePackageReason into UnusableUnitReason
* rename getPackage* into getUnit*
* etc.

1 files changed, 3 insertions, 3 deletions

diff --git a/ghc/Main.hs b/ghc/Main.hs
index 655b03e7bd..bd2028b70b 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -865,9 +865,9 @@ dumpFastStringStats dflags = do
    x `pcntOf` y = int ((x * 100) `quot` y) Outputable.<> char '%'
 
 showPackages, dumpPackages, dumpPackagesSimple :: DynFlags -> IO ()
-showPackages       dflags = putStrLn (showSDoc dflags (pprPackages (pkgState dflags)))
-dumpPackages       dflags = putMsg dflags (pprPackages (pkgState dflags))
-dumpPackagesSimple dflags = putMsg dflags (pprPackagesSimple (pkgState dflags))
+showPackages       dflags = putStrLn (showSDoc dflags (pprPackages (unitState dflags)))
+dumpPackages       dflags = putMsg dflags (pprPackages (unitState dflags))
+dumpPackagesSimple dflags = putMsg dflags (pprPackagesSimple (unitState dflags))
 
 -- -----------------------------------------------------------------------------
 -- Frontend plugin support