aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--haddock-api/src/Haddock/ModuleTree.hs5
-rw-r--r--haddock-api/src/Haddock/Options.hs2
2 files changed, 3 insertions, 4 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
diff --git a/haddock-api/src/Haddock/Options.hs b/haddock-api/src/Haddock/Options.hs
index e314bbd0..fe2bb048 100644
--- a/haddock-api/src/Haddock/Options.hs
+++ b/haddock-api/src/Haddock/Options.hs
@@ -382,4 +382,4 @@ modulePackageInfo dflags flags (Just modu) =
, optPackageVersion flags <|> fmap packageVersion pkgDb
)
where
- pkgDb = lookupPackage dflags (moduleUnitId modu)
+ pkgDb = lookupUnit dflags (moduleUnitId modu)