diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-01-31 05:56:50 -0500 |
|---|---|---|
| committer | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-01-31 05:56:50 -0500 |
| commit | f3e3c4a766805a1bbea75bf23b84fdaaf053c226 (patch) | |
| tree | 9b253aa2b52bb25fa16033e445186113247f4a37 /haddock-api/src/Haddock/ModuleTree.hs | |
| parent | 42418f165ab8a8f9ac61676d8600c057cb71e12f (diff) | |
| parent | 4808003d2238f76aee96d22cc022cee3e049f6a1 (diff) | |
Merge branch 'wip-hsyl20-package-refactor' into ghc-head
Diffstat (limited to 'haddock-api/src/Haddock/ModuleTree.hs')
| -rw-r--r-- | haddock-api/src/Haddock/ModuleTree.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/haddock-api/src/Haddock/ModuleTree.hs b/haddock-api/src/Haddock/ModuleTree.hs index a0be820a..cff4e8f0 100644 --- a/haddock-api/src/Haddock/ModuleTree.hs +++ b/haddock-api/src/Haddock/ModuleTree.hs @@ -17,8 +17,7 @@ import Haddock.Types ( MDoc ) import GHC ( Name ) import Module ( Module, moduleNameString, moduleName, moduleUnitId, unitIdString ) import DynFlags ( DynFlags ) -import Packages ( lookupPackage ) -import PackageConfig ( sourcePackageIdString ) +import Packages ( lookupUnit, sourcePackageIdString ) import qualified Control.Applicative as A @@ -33,7 +32,7 @@ mkModuleTree dflags showPkgs mods = modPkg mod_ | showPkgs = Just (unitIdString (moduleUnitId mod_)) | otherwise = Nothing modSrcPkg mod_ | showPkgs = fmap sourcePackageIdString - (lookupPackage dflags (moduleUnitId mod_)) + (lookupUnit dflags (moduleUnitId mod_)) | otherwise = Nothing fn (m,mod_,pkg,srcPkg,short) = addToTrees mod_ m pkg srcPkg short |