aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--haddock.cabal5
-rw-r--r--src/Haddock/Backends/Hoogle.hs2
-rw-r--r--src/Haddock/Backends/Html.hs2
-rw-r--r--src/Haddock/GHC.hs4
-rw-r--r--src/Haddock/GhcUtils.hs (renamed from src/Haddock/GHC/Utils.hs)2
-rw-r--r--src/Haddock/Interface.hs2
-rw-r--r--src/Haddock/Interface/Create.hs2
-rw-r--r--src/Haddock/Interface/Rename.hs2
-rw-r--r--src/Haddock/Utils.hs2
9 files changed, 11 insertions, 12 deletions
diff --git a/haddock.cabal b/haddock.cabal
index 73b92dad..9fe53e43 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -112,8 +112,7 @@ executable haddock
Haddock.InterfaceFile
Haddock.Exception
Haddock.Options
- Haddock.GHC.Utils
- Haddock.GHC
+ Haddock.GhcUtils
-- Cabal doesn't define __GHC_PATCHLEVEL__
if impl(ghc == 6.10.1)
@@ -133,7 +132,7 @@ library
Haddock.InterfaceFile
Haddock.Exception
Haddock.Utils
- Haddock.GHC.Utils
+ Haddock.GhcUtils
-- Cabal doesn't define __GHC_PATCHLEVEL__
if impl(ghc == 6.10.1)
diff --git a/src/Haddock/Backends/Hoogle.hs b/src/Haddock/Backends/Hoogle.hs
index 242d075c..089e58de 100644
--- a/src/Haddock/Backends/Hoogle.hs
+++ b/src/Haddock/Backends/Hoogle.hs
@@ -12,7 +12,7 @@ module Haddock.Backends.Hoogle (
) where
-import Haddock.GHC.Utils
+import Haddock.GhcUtils
import Haddock.Types
import Haddock.Utils hiding (out)
import GHC
diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs
index 746fcbbd..3503900f 100644
--- a/src/Haddock/Backends/Html.hs
+++ b/src/Haddock/Backends/Html.hs
@@ -23,7 +23,7 @@ import Haddock.Version
import Haddock.Utils
import Haddock.Utils.Html hiding ( name, title, p )
import qualified Haddock.Utils.Html as Html
-import Haddock.GHC.Utils
+import Haddock.GhcUtils
import qualified Haddock.Utils.Html as Html
import Control.Exception ( bracket )
diff --git a/src/Haddock/GHC.hs b/src/Haddock/GHC.hs
index 8ec4be82..c7ef9b88 100644
--- a/src/Haddock/GHC.hs
+++ b/src/Haddock/GHC.hs
@@ -7,11 +7,11 @@
module Haddock.GHC (
startGhc,
- module Haddock.GHC.Utils
+ module Haddock.GhcUtils
) where
-import Haddock.GHC.Utils
+import Haddock.GhcUtils
import Haddock.Exception
import Data.Maybe
diff --git a/src/Haddock/GHC/Utils.hs b/src/Haddock/GhcUtils.hs
index 7cbcf07f..af091a7a 100644
--- a/src/Haddock/GHC/Utils.hs
+++ b/src/Haddock/GhcUtils.hs
@@ -10,7 +10,7 @@
{-# OPTIONS_HADDOCK hide #-}
-module Haddock.GHC.Utils where
+module Haddock.GhcUtils where
import Data.Char
diff --git a/src/Haddock/Interface.hs b/src/Haddock/Interface.hs
index 79bb00cf..b5f73ddb 100644
--- a/src/Haddock/Interface.hs
+++ b/src/Haddock/Interface.hs
@@ -19,7 +19,7 @@ import Haddock.Interface.AttachInstances
import Haddock.Interface.Rename
import Haddock.Types
import Haddock.Options
-import Haddock.GHC.Utils
+import Haddock.GhcUtils
import Haddock.Utils
import Haddock.InterfaceFile
diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs
index e5beffd1..0b271900 100644
--- a/src/Haddock/Interface/Create.hs
+++ b/src/Haddock/Interface/Create.hs
@@ -10,7 +10,7 @@ module Haddock.Interface.Create (createInterface) where
import Haddock.Types
import Haddock.Options
-import Haddock.GHC.Utils
+import Haddock.GhcUtils
import Haddock.Utils
import qualified Data.Map as Map
diff --git a/src/Haddock/Interface/Rename.hs b/src/Haddock/Interface/Rename.hs
index 7a9a3292..733a372f 100644
--- a/src/Haddock/Interface/Rename.hs
+++ b/src/Haddock/Interface/Rename.hs
@@ -9,7 +9,7 @@ module Haddock.Interface.Rename (renameInterface) where
import Haddock.Types
-import Haddock.GHC.Utils
+import Haddock.GhcUtils
import GHC hiding (NoLink)
import Name
diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs
index 86049d62..a3679dba 100644
--- a/src/Haddock/Utils.hs
+++ b/src/Haddock/Utils.hs
@@ -47,7 +47,7 @@ module Haddock.Utils (
) where
import Haddock.Types
-import Haddock.GHC.Utils
+import Haddock.GhcUtils
import GHC
import SrcLoc