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/Interface | |
| parent | c90796ed7a6a625854d28bf55c71eeb36d298c55 (diff) | |
Revert "Track GHC PackageId to PackageKey renaming."
This reverts commit 8ac42d3327473939c013551750425cac191ff0fd.
Diffstat (limited to 'src/Haddock/Interface')
| -rw-r--r-- | src/Haddock/Interface/Create.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs index abc65f12..bc615cde 100644 --- a/src/Haddock/Interface/Create.hs +++ b/src/Haddock/Interface/Create.hs @@ -157,7 +157,7 @@ mkAliasMap dflags mRenamedSource = alias <- ideclAs impDecl return $ (lookupModuleDyn dflags - (fmap Module.fsToPackageKey $ + (fmap Module.fsToPackageId $ ideclPkgQual impDecl) (case ideclName impDecl of SrcLoc.L _ name -> name), alias)) @@ -165,7 +165,7 @@ mkAliasMap dflags mRenamedSource = -- similar to GHC.lookupModule lookupModuleDyn :: - DynFlags -> Maybe PackageKey -> ModuleName -> Module + DynFlags -> Maybe PackageId -> ModuleName -> Module lookupModuleDyn _ (Just pkgId) mdlName = Module.mkModule pkgId mdlName lookupModuleDyn dflags Nothing mdlName = @@ -173,7 +173,7 @@ lookupModuleDyn dflags Nothing mdlName = case filter snd $ Packages.lookupModuleInAllPackages dflags mdlName of (pkgId,_):_ -> Packages.packageConfigId pkgId - [] -> Module.mainPackageKey + [] -> Module.mainPackageId ------------------------------------------------------------------------------- @@ -678,8 +678,8 @@ moduleExports thisMod expMod dflags warnings gre _exports decls ifaceMap instIfa "documentation for exported module: " ++ pretty dflags expMod] return [] where - m = mkModule packageKey expMod - packageKey = modulePackageKey thisMod + m = mkModule packageId expMod + packageId = modulePackageId thisMod -- Note [1]: |