diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-08-14 20:23:42 +0100 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-08-14 20:23:42 +0100 |
| commit | 9f37affe403f19faad0d9874f7d552f094d18af0 (patch) | |
| tree | 44908301443a76e7c19936d3cb686de07bfcf82e /src/Haddock.hs | |
| parent | c90796ed7a6a625854d28bf55c71eeb36d298c55 (diff) | |
Revert "Track GHC PackageId to PackageKey renaming."
This reverts commit 8ac42d3327473939c013551750425cac191ff0fd.
Diffstat (limited to 'src/Haddock.hs')
| -rw-r--r-- | src/Haddock.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Haddock.hs b/src/Haddock.hs index 024b1098..3d049b18 100644 --- a/src/Haddock.hs +++ b/src/Haddock.hs @@ -215,7 +215,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 [ (ifPackageId if_, x) | ((_, Just x), if_) <- pkgs ] render dflags flags qual interfaces installedIfaces srcMap @@ -240,14 +240,14 @@ 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) + pkgId = modulePackageId pkgMod + pkgStr = Just (packageIdString pkgId) (pkgName,pkgVer) = modulePackageInfo pkgMod (srcBase, srcModule, srcEntity, srcLEntity) = sourceUrls flags - srcMap' = maybe srcMap (\path -> Map.insert pkgKey path srcMap) srcEntity + srcMap' = maybe srcMap (\path -> Map.insert pkgId path srcMap) srcEntity -- TODO: Get these from the interface files as with srcMap - srcLMap' = maybe Map.empty (\path -> Map.singleton pkgKey path) srcLEntity + srcLMap' = maybe Map.empty (\path -> Map.singleton pkgId path) srcLEntity sourceUrls' = (srcBase, srcModule, srcMap', srcLMap') libDir <- getHaddockLibDir flags |