From 982308060ed4a49478b9188e9cab50d9a4f6c5b9 Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Thu, 16 Jan 2020 18:28:25 +0100 Subject: Rename PackageConfig into UnitInfo --- haddock-api/src/Haddock/ModuleTree.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haddock-api/src/Haddock/ModuleTree.hs b/haddock-api/src/Haddock/ModuleTree.hs index a0be820a..3ad1f247 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 ( lookupPackage, sourcePackageIdString ) import qualified Control.Applicative as A -- cgit v1.2.3 From 4808003d2238f76aee96d22cc022cee3e049f6a1 Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Thu, 16 Jan 2020 20:25:44 +0100 Subject: Rename lookupPackage --- haddock-api/src/Haddock/ModuleTree.hs | 4 ++-- haddock-api/src/Haddock/Options.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/haddock-api/src/Haddock/ModuleTree.hs b/haddock-api/src/Haddock/ModuleTree.hs index 3ad1f247..cff4e8f0 100644 --- a/haddock-api/src/Haddock/ModuleTree.hs +++ b/haddock-api/src/Haddock/ModuleTree.hs @@ -17,7 +17,7 @@ import Haddock.Types ( MDoc ) import GHC ( Name ) import Module ( Module, moduleNameString, moduleName, moduleUnitId, unitIdString ) import DynFlags ( DynFlags ) -import Packages ( lookupPackage, sourcePackageIdString ) +import Packages ( lookupUnit, sourcePackageIdString ) import qualified Control.Applicative as A @@ -32,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) -- cgit v1.2.3