diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-12-12 06:22:31 +0000 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-12-12 06:22:31 +0000 |
| commit | e1156b56e4711546956f5588b7b4258cb42caaac (patch) | |
| tree | a203335acfb5e53087001f054c3a5a345635585c /haddock-api/src/Haddock/ModuleTree.hs | |
| parent | d867ff18c6d23d792d070b17cc76cba35f69c649 (diff) | |
Revert "Merge branch 'reverts'"
This reverts commit 5c93cc347773c7634321edd5f808d5b55b46301f, reversing
changes made to 5b81a9e53894d2ae591ca0c6c96199632d39eb06.
Conflicts:
haddock-api/src/Haddock/Convert.hs
Diffstat (limited to 'haddock-api/src/Haddock/ModuleTree.hs')
| -rw-r--r-- | haddock-api/src/Haddock/ModuleTree.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/haddock-api/src/Haddock/ModuleTree.hs b/haddock-api/src/Haddock/ModuleTree.hs index 22cfcdfa..662d7025 100644 --- a/haddock-api/src/Haddock/ModuleTree.hs +++ b/haddock-api/src/Haddock/ModuleTree.hs @@ -15,8 +15,8 @@ module Haddock.ModuleTree ( ModuleTree(..), mkModuleTree ) where import Haddock.Types ( MDoc ) import GHC ( Name ) -import Module ( Module, moduleNameString, moduleName, modulePackageId, - packageIdString ) +import Module ( Module, moduleNameString, moduleName, modulePackageKey, + packageKeyString ) data ModuleTree = Node String Bool (Maybe String) (Maybe (MDoc Name)) [ModuleTree] @@ -26,7 +26,7 @@ mkModuleTree :: Bool -> [(Module, Maybe (MDoc Name))] -> [ModuleTree] mkModuleTree showPkgs mods = foldr fn [] [ (splitModule mdl, modPkg mdl, short) | (mdl, short) <- mods ] where - modPkg mod_ | showPkgs = Just (packageIdString (modulePackageId mod_)) + modPkg mod_ | showPkgs = Just (packageKeyString (modulePackageKey mod_)) | otherwise = Nothing fn (mod_,pkg,short) = addToTrees mod_ pkg short |