aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2008-08-13 21:44:17 +0000
committerDavid Waern <david.waern@gmail.com>2008-08-13 21:44:17 +0000
commit8fe13e0015d3e4a7190724c5c9a2442c1f176474 (patch)
tree17b230879637fe7e8d9183829c72146718568983 /src
parentbefdccf529dcb60d5f2a909e308b85c958e6100e (diff)
Follow move of package string functions from PackageConfig to Module
Diffstat (limited to 'src')
-rw-r--r--src/Haddock/Backends/DevHelp.hs6
-rw-r--r--src/Haddock/Backends/Html.hs2
-rw-r--r--src/Haddock/ModuleTree.hs6
-rw-r--r--src/Haddock/Utils.hs2
4 files changed, 11 insertions, 5 deletions
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 )
diff --git a/src/Haddock/ModuleTree.hs b/src/Haddock/ModuleTree.hs
index 2413f951..eccfd3e5 100644
--- a/src/Haddock/ModuleTree.hs
+++ b/src/Haddock/ModuleTree.hs
@@ -9,7 +9,11 @@ module Haddock.ModuleTree ( ModuleTree(..), mkModuleTree ) where
import Haddock.DocName
import GHC ( HsDoc, Name )
import Module ( Module, moduleNameString, moduleName, modulePackageId )
-import PackageConfig ( packageIdString )
+#if __GLASGOW_HASKELL__ >= 609
+import Module (packageIdString)
+#else
+import PackageConfig (packageIdString)
+#endif
data ModuleTree = Node String Bool (Maybe String) (Maybe (HsDoc Name)) [ModuleTree]
diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs
index 8c9cf5b1..b776272a 100644
--- a/src/Haddock/Utils.hs
+++ b/src/Haddock/Utils.hs
@@ -48,7 +48,7 @@ import Name
import OccName
import Binary
import Module
-import PackageConfig ( stringToPackageId )
+import PackageConfig
import Control.Monad ( liftM, MonadPlus(..) )
import Data.Char ( isAlpha, isSpace, toUpper, ord, chr )