aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-01-02 19:01:55 +0100
committerSylvain Henry <sylvain@haskus.fr>2020-01-02 19:01:55 +0100
commit344cfc239a108258f7caba6f064ccc16c2c00634 (patch)
tree2fb3a6a2d47afc069ce9fb7883ebcc45ad61fb9d /haddock-api/src/Haddock
parentf4298e24044cf01890ff6a257d387ee9a7f13d85 (diff)
Fix after Iface modules renaming
Diffstat (limited to 'haddock-api/src/Haddock')
-rw-r--r--haddock-api/src/Haddock/Backends/Hyperlinker.hs4
-rw-r--r--haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs2
-rw-r--r--haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs8
-rw-r--r--haddock-api/src/Haddock/Convert.hs2
-rw-r--r--haddock-api/src/Haddock/GhcUtils.hs2
-rw-r--r--haddock-api/src/Haddock/InterfaceFile.hs4
6 files changed, 11 insertions, 11 deletions
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker.hs b/haddock-api/src/Haddock/Backends/Hyperlinker.hs
index 7571db9e..6d5b5b5d 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker.hs
@@ -18,8 +18,8 @@ import Data.Maybe
import System.Directory
import System.FilePath
-import HieTypes ( HieFile(..), HieASTs(..) )
-import HieBin ( readHieFile, hie_file_result)
+import GHC.Iface.Ext.Types ( HieFile(..), HieASTs(..) )
+import GHC.Iface.Ext.Binary ( readHieFile, hie_file_result)
import Data.Map as M
import FastString ( mkFastString )
import Module ( Module, moduleName )
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs
index 404cb9d0..4f61e09e 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs
@@ -12,7 +12,7 @@ import Haddock.Backends.Hyperlinker.Utils
import qualified Data.ByteString as BS
-import HieTypes
+import GHC.Iface.Ext.Types
import Module ( ModuleName, moduleNameString )
import Name ( getOccString, isInternalName, Name, nameModule, nameUnique )
import SrcLoc
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs
index 67eb10b5..7696d072 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs
@@ -18,8 +18,8 @@ import Haddock.Utils
import Haddock.Backends.Xhtml.Utils
import GHC
-import HieTypes ( HieAST(..), HieType(..), HieArgs(..), TypeIndex, HieTypeFlat )
-import IfaceType
+import GHC.Iface.Ext.Types ( HieAST(..), HieType(..), HieArgs(..), TypeIndex, HieTypeFlat )
+import GHC.Iface.Type
import Name ( getOccFS, getOccString )
import Outputable ( showSDoc )
import Var ( VarBndr(..) )
@@ -82,9 +82,9 @@ lineFormat :: String
lineFormat = "line-%{LINE}"
--- * HIE file procesddsing
+-- * HIE file processing
--- This belongs in GHC's HieUtils...
+-- This belongs in GHC.Iface.Ext.Utils...
-- | Pretty-printed type, ready to be turned into HTML by @xhtml@
type PrintedType = String
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index 6e2c0b9f..0c48d773 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -56,7 +56,7 @@ import Data.Maybe ( catMaybes, maybeToList )
-- | Whether or not to default 'RuntimeRep' variables to 'LiftedRep'. Check
--- out Note [Defaulting RuntimeRep variables] in IfaceType.hs for the
+-- out Note [Defaulting RuntimeRep variables] in GHC.Iface.Type for the
-- motivation.
data PrintRuntimeReps = ShowRuntimeRep | HideRuntimeRep deriving Show
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
index 38abee7a..7350f116 100644
--- a/haddock-api/src/Haddock/GhcUtils.hs
+++ b/haddock-api/src/Haddock/GhcUtils.hs
@@ -643,7 +643,7 @@ tyCoFVsBndr' (Bndr tv _) fvs = FV.delFV tv fvs `unionFV` tyCoFVsOfType' (tyVarKi
-------------------------------------------------------------------------------
-- | Traverses the type, defaulting type variables of kind 'RuntimeRep' to
--- 'LiftedType'. See 'defaultRuntimeRepVars' in IfaceType.hs the original such
+-- 'LiftedType'. See 'defaultRuntimeRepVars' in GHC.Iface.Type the original such
-- function working over `IfaceType`'s.
defaultRuntimeRepVars :: Type -> Type
defaultRuntimeRepVars = go emptyVarEnv
diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index 9e199a3d..812d6a50 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -31,7 +31,7 @@ import qualified Data.Map as Map
import Data.Map (Map)
import Data.Word
-import BinIface (getSymtabName, getDictFastString)
+import GHC.Iface.Binary (getSymtabName, getDictFastString)
import Binary
import FastMutInt
import FastString
@@ -39,7 +39,7 @@ import GHC hiding (NoLink)
import GhcMonad (withSession)
import HscTypes
import NameCache
-import IfaceEnv
+import GHC.Iface.Env
import Name
import UniqFM
import UniqSupply