diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-11 11:03:10 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-14 21:40:49 -0700 |
| commit | b92a51f5e235fc22a9ae0d76735b50f095665fb7 (patch) | |
| tree | 27eb41de475255206185e68c535c2d899012fa1b /utils/ghc-pkg | |
| parent | 5b0191f74ab05b187f81ea037623338a615b1619 (diff) | |
| download | haskell-b92a51f5e235fc22a9ae0d76735b50f095665fb7.tar.gz | |
Rename package key to unit ID, and installed package ID to component ID.
Comes with Haddock submodule update.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'utils/ghc-pkg')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index 8095cc434a..4bc603459a 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -1076,17 +1076,17 @@ type PackageCacheFormat = GhcPkg.InstalledPackageInfo String -- installed package id String -- src package id String -- package name - String -- package key + String -- unit id ModuleName -- module name convertPackageInfoToCacheFormat :: InstalledPackageInfo -> PackageCacheFormat convertPackageInfoToCacheFormat pkg = GhcPkg.InstalledPackageInfo { - GhcPkg.installedPackageId = display (installedComponentId pkg), + GhcPkg.componentId = display (installedComponentId pkg), GhcPkg.sourcePackageId = display (sourcePackageId pkg), GhcPkg.packageName = display (packageName pkg), GhcPkg.packageVersion = packageVersion pkg, - GhcPkg.packageKey = display (installedComponentId pkg), + GhcPkg.unitId = display (installedComponentId pkg), GhcPkg.depends = map display (depends pkg), GhcPkg.abiHash = let AbiHash abi = abiHash pkg in abi, @@ -1328,7 +1328,7 @@ showPackageDot verbosity myflags = do -- ----------------------------------------------------------------------------- -- Prints the highest (hidden or exposed) version of a package --- ToDo: This is no longer well-defined with package keys, because the +-- ToDo: This is no longer well-defined with unit ids, because the -- dependencies may be varying versions latestPackage :: Verbosity -> [Flag] -> PackageIdentifier -> IO () latestPackage verbosity my_flags pkgid = do |