aboutsummaryrefslogtreecommitdiff
path: root/src/Haddock
diff options
context:
space:
mode:
Diffstat (limited to 'src/Haddock')
-rw-r--r--src/Haddock/Html.hs2
-rw-r--r--src/Haddock/InterfaceFile.hs2
-rw-r--r--src/Haddock/Rename.hs2
-rw-r--r--src/Haddock/Types.hs2
-rw-r--r--src/Haddock/Version.hs4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/Haddock/Html.hs b/src/Haddock/Html.hs
index c89485bc..c6b4edf0 100644
--- a/src/Haddock/Html.hs
+++ b/src/Haddock/Html.hs
@@ -33,7 +33,7 @@ import Debug.Trace ( trace )
import Data.Map ( Map )
import qualified Data.Map as Map hiding ( Map )
-import GHC
+import GHC hiding ( NoLink )
import Name
import Module
import PackageConfig ( stringToPackageId )
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
index 54dc3618..9b8e0b3e 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/src/Haddock/InterfaceFile.hs
@@ -183,7 +183,7 @@ fromOnDiskName arr nc (pid, mod_name, occ) =
let
us = nsUniqs nc
uniq = uniqFromSupply us
- name = mkExternalName uniq mod occ noSrcLoc
+ name = mkExternalName uniq mod occ noSrcSpan
new_cache = extendNameCache cache mod occ name
in
case splitUniqSupply us of { (us',_) ->
diff --git a/src/Haddock/Rename.hs b/src/Haddock/Rename.hs
index c8e5cc8e..6ba07215 100644
--- a/src/Haddock/Rename.hs
+++ b/src/Haddock/Rename.hs
@@ -11,7 +11,7 @@ module Haddock.Rename (
import Haddock.Types
-import GHC
+import GHC hiding ( NoLink )
import BasicTypes
import SrcLoc
import Bag ( emptyBag )
diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs
index 4c4587ac..6ae2309e 100644
--- a/src/Haddock/Types.hs
+++ b/src/Haddock/Types.hs
@@ -8,7 +8,7 @@
module Haddock.Types where
-import GHC
+import GHC hiding (NoLink)
import Outputable
import Data.Map
diff --git a/src/Haddock/Version.hs b/src/Haddock/Version.hs
index f4d02b7d..3df24f1c 100644
--- a/src/Haddock/Version.hs
+++ b/src/Haddock/Version.hs
@@ -8,8 +8,8 @@ module Haddock.Version (
projectName, projectVersion, projectUrl
) where
-import Paths_haddock_ghc ( version )
-import Data.Version ( showVersion )
+import Paths_haddock ( version )
+import Data.Version ( showVersion )
projectName, projectUrl :: String
projectName = "Haddock-GHC"