From 8fe13e0015d3e4a7190724c5c9a2442c1f176474 Mon Sep 17 00:00:00 2001 From: David Waern Date: Wed, 13 Aug 2008 21:44:17 +0000 Subject: Follow move of package string functions from PackageConfig to Module --- src/Haddock/Backends/DevHelp.hs | 6 ++++-- src/Haddock/Backends/Html.hs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Haddock/Backends') diff --git a/src/Haddock/Backends/DevHelp.hs b/src/Haddock/Backends/DevHelp.hs index 3ba7baf3..951e422c 100644 --- a/src/Haddock/Backends/DevHelp.hs +++ b/src/Haddock/Backends/DevHelp.hs @@ -10,9 +10,11 @@ import Haddock.ModuleTree import Haddock.Types import Haddock.Utils -import Module ( moduleName, moduleNameString, Module, mkModule, mkModuleName ) -import PackageConfig ( stringToPackageId ) +import Module import Name ( Name, nameModule, getOccString, nameOccName ) +#if __GLASGOW_HASKELL__ < 609 +import PackageConfig (stringToPackageId) +#endif import Data.Maybe ( fromMaybe ) import qualified Data.Map as Map diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs index 3e0432ff..80bf9a2b 100644 --- a/src/Haddock/Backends/Html.hs +++ b/src/Haddock/Backends/Html.hs @@ -39,7 +39,7 @@ import qualified Data.Map as Map hiding ( Map ) import GHC hiding ( NoLink ) import Name import Module -import PackageConfig ( stringToPackageId ) +import PackageConfig import RdrName hiding ( Qual ) import SrcLoc import FastString ( unpackFS ) -- cgit v1.2.3