diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-13 11:32:41 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-13 02:13:03 -0400 |
| commit | ed533ec217667423e4fce30040f24053dbcc7de4 (patch) | |
| tree | a810bd338fb4044538fba0c78df041a3e2c225e1 /compiler/GHC/Tc | |
| parent | f50c19b8a78da9252cb39f49c1c66db4a684cc3b (diff) | |
| download | haskell-ed533ec217667423e4fce30040f24053dbcc7de4.tar.gz | |
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.
Diffstat (limited to 'compiler/GHC/Tc')
| -rw-r--r-- | compiler/GHC/Tc/Utils/Backpack.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/GHC/Tc/Utils/Backpack.hs b/compiler/GHC/Tc/Utils/Backpack.hs index 5643ec05fb..87890fa94d 100644 --- a/compiler/GHC/Tc/Utils/Backpack.hs +++ b/compiler/GHC/Tc/Utils/Backpack.hs @@ -274,7 +274,7 @@ findExtraSigImports' hsc_env HsigFile modname = $ moduleFreeHolesPrecise (text "findExtraSigImports") (mkModule (VirtUnit iuid) mod_name))) where - pkgstate = pkgState (hsc_dflags hsc_env) + pkgstate = unitState (hsc_dflags hsc_env) reqs = requirementMerges pkgstate modname findExtraSigImports' _ _ _ = return emptyUniqDSet @@ -535,7 +535,7 @@ mergeSignatures let outer_mod = tcg_mod tcg_env inner_mod = tcg_semantic_mod tcg_env mod_name = moduleName (tcg_mod tcg_env) - pkgstate = pkgState dflags + pkgstate = unitState dflags -- STEP 1: Figure out all of the external signature interfaces -- we are going to merge in. @@ -1005,7 +1005,7 @@ instantiateSignature = do let uid = fromJust (homeUnitInstanceOfId dflags) -- we need to fetch the most recent ppr infos from the unit -- database because we might have modified it - uid' = updateIndefUnitId (pkgState dflags) uid + uid' = updateIndefUnitId (unitState dflags) uid inner_mod `checkImplements` Module (mkInstantiatedUnit uid' (homeUnitInstantiations dflags)) |