diff options
author | David Waern <unknown> | 2007-07-11 21:35:45 +0000 |
---|---|---|
committer | David Waern <unknown> | 2007-07-11 21:35:45 +0000 |
commit | d086d2a733fa0256f65038be8f2f6d10f5d1fcde (patch) | |
tree | b18ca8dbfd371a02d37cea19072264f5720fb9b9 /src | |
parent | b30f5ecfdae9dea8048c19051732b71f7633f9c9 (diff) |
Fix conflicts
Diffstat (limited to 'src')
-rw-r--r-- | src/Haddock/Html.hs | 2 | ||||
-rw-r--r-- | src/Haddock/InterfaceFile.hs | 2 | ||||
-rw-r--r-- | src/Haddock/Rename.hs | 2 | ||||
-rw-r--r-- | src/Haddock/Types.hs | 2 | ||||
-rw-r--r-- | src/Haddock/Version.hs | 4 | ||||
-rw-r--r-- | src/Main.hs | 9 |
6 files changed, 10 insertions, 11 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" diff --git a/src/Main.hs b/src/Main.hs index cf534560..9f7ff25f 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -17,7 +17,7 @@ import Haddock.Version import Haddock.InterfaceFile import Haddock.Exception import Haddock.Utils.GHC -import Paths_haddock_ghc ( getDataDir ) +import Paths_haddock ( getDataDir ) import Prelude hiding ( catch ) import Control.Exception @@ -47,7 +47,7 @@ import qualified Data.Map as Map import Data.Map (Map) import Distribution.InstalledPackageInfo ( InstalledPackageInfo(..) ) -import Distribution.Simple.Utils ( withTempFile ) +import Distribution.Simple.Utils import GHC import Outputable @@ -301,8 +301,7 @@ byeVersion = startGHC :: String -> IO (Session, DynFlags) startGHC libDir = do - let ghcMode = BatchCompile - session <- newSession ghcMode (Just libDir) + session <- newSession (Just libDir) flags <- getSessionDynFlags session flags' <- liftM fst (initPackages flags) let flags'' = dopt_set flags' Opt_Haddock @@ -1044,7 +1043,7 @@ buildGlobalDocEnv modules keep_new env n = Map.insert n (nameSetMod n modName) env nameSetMod n newMod = mkExternalName (nameUnique n) newMod (nameOccName n) - (nameSrcLoc n) + (nameSrcSpan n) -- ----------------------------------------------------------------------------- -- Named documentation |