diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-11 11:31:11 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-11 13:10:10 -0700 |
| commit | c7a8a8b32c9075873d666f7d0fc8a99828e17344 (patch) | |
| tree | 93506cc006080c0762660fe9e98c346c942f71ca /haddock-api/src/Haddock.hs | |
| parent | e083daa4a46ae2f9a244b6bcedc5951b3a78f260 (diff) | |
s/PackageKey/UnitId/g and s/packageKey/unitId/g
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'haddock-api/src/Haddock.hs')
| -rw-r--r-- | haddock-api/src/Haddock.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs index 5a62f3db..72ec21c8 100644 --- a/haddock-api/src/Haddock.hs +++ b/haddock-api/src/Haddock.hs @@ -222,7 +222,7 @@ renderStep dflags flags qual pkgs interfaces = do let ifaceFiles = map snd pkgs installedIfaces = concatMap ifInstalledIfaces ifaceFiles - srcMap = Map.fromList [ (ifPackageKey if_, x) | ((_, Just x), if_) <- pkgs ] + srcMap = Map.fromList [ (ifUnitId if_, x) | ((_, Just x), if_) <- pkgs ] render dflags flags qual interfaces installedIfaces srcMap @@ -247,8 +247,8 @@ render dflags flags qual ifaces installedIfaces srcMap = do allVisibleIfaces = [ i | i <- allIfaces, OptHide `notElem` instOptions i ] pkgMod = ifaceMod (head ifaces) - pkgKey = modulePackageKey pkgMod - pkgStr = Just (packageKeyString pkgKey) + pkgKey = moduleUnitId pkgMod + pkgStr = Just (unitIdString pkgKey) (pkgName,pkgVer) = modulePackageInfo dflags flags pkgMod (srcBase, srcModule, srcEntity, srcLEntity) = sourceUrls flags @@ -314,7 +314,7 @@ modulePackageInfo dflags flags modu = (fromMaybe (packageName pkg) (optPackageName flags), fromMaybe (packageVersion pkg) (optPackageVersion flags)) where - pkg = getPackageDetails dflags (modulePackageKey modu) + pkg = getPackageDetails dflags (moduleUnitId modu) ------------------------------------------------------------------------------- |