diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-03-27 10:49:16 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-30 01:56:56 -0400 |
| commit | 10a2ba90aa6a788677104cc43318c66f46e2e2b0 (patch) | |
| tree | 86f1cadd79243ef67a7f150c5f074e5aa2115ccf /ghc | |
| parent | 2cfc4ab9710c873a55e9a44aac9dacb06ecce36f (diff) | |
| download | haskell-10a2ba90aa6a788677104cc43318c66f46e2e2b0.tar.gz | |
Refactor UnitInfo
* Rename InstalledPackageInfo into GenericUnitInfo
The name InstalledPackageInfo is only kept for alleged backward
compatibility reason in Cabal. ghc-boot has its own stripped down copy
of this datatype but it doesn't need to keep the name. Internally we
already use type aliases (UnitInfo in GHC, PackageCacheFormat in
ghc-pkg).
* Rename UnitInfo fields: add "unit" prefix and fix misleading names
* Add comments on every UnitInfo field
* Rename SourcePackageId into PackageId
"Package" already indicates that it's a "source package". Installed
package components are called units.
Update Haddock submodule
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/UI.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index 46fe4fb4a5..0da9741f30 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -57,7 +57,7 @@ import GHC.Driver.Types ( tyThingParent_maybe, handleFlagWarnings, getSafeMode, hsc_dynLinker, hsc_interp ) import GHC.Types.Module import GHC.Types.Name -import GHC.Driver.Packages ( trusted, getPackageDetails, getInstalledPackageDetails, +import GHC.Driver.Packages ( unitIsTrusted, getPackageDetails, getInstalledPackageDetails, listVisibleModuleNames, pprFlag ) import GHC.Iface.Syntax ( showToHeader ) import GHC.Core.Ppr.TyThing @@ -2341,11 +2341,11 @@ isSafeModule m = do packageTrusted dflags md | thisPackage dflags == moduleUnitId md = True - | otherwise = trusted $ getPackageDetails dflags (moduleUnitId md) + | otherwise = unitIsTrusted $ getPackageDetails dflags (moduleUnitId md) tallyPkgs dflags deps | not (packageTrustOn dflags) = (S.empty, S.empty) | otherwise = S.partition part deps - where part pkg = trusted $ getInstalledPackageDetails pkgstate pkg + where part pkg = unitIsTrusted $ getInstalledPackageDetails pkgstate pkg pkgstate = pkgState dflags ----------------------------------------------------------------------------- |