Module structure

9 files changed, 16 insertions, 17 deletions

diff --git a/haddock-api/src/Haddock/Backends/Hoogle.hs b/haddock-api/src/Haddock/Backends/Hoogle.hs
index 36001714..5d658a7e 100644
--- a/haddock-api/src/Haddock/Backends/Hoogle.hs
+++ b/haddock-api/src/Haddock/Backends/Hoogle.hs
@@ -26,8 +26,7 @@ import Haddock.Types hiding (Version)
 import Haddock.Utils hiding (out)
 
 import GHC
-import Outputable
-import GHC.Types.Name.Set
+import GHC.Utils.Outputable as Outputable
 
 import Data.Char
 import Data.List
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker.hs b/haddock-api/src/Haddock/Backends/Hyperlinker.hs
index 8e0e4d54..fb238995 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker.hs
@@ -21,7 +21,7 @@ import System.FilePath
 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 GHC.Data.FastString     ( mkFastString )
 import GHC.Types.Module        ( Module, moduleName )
 import GHC.Types.Name.Cache    ( initNameCache )
 import GHC.Types.Unique.Supply ( mkSplitUniqSupply )
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
index ddf70b5f..41591c6e 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
@@ -11,15 +11,15 @@ import qualified Data.ByteString as BS
 
 import GHC.Types.Basic     ( IntegralLit(..) )
 import GHC.Driver.Session
-import ErrUtils            ( pprLocErrMsg )
-import FastString          ( mkFastString )
+import GHC.Utils.Error     ( pprLocErrMsg )
+import GHC.Data.FastString ( mkFastString )
 import GHC.Parser.Lexer    as Lexer
                            ( P(..), ParseResult(..), PState(..), Token(..)
                            , mkPStatePure, lexer, mkParserFlags', getErrorMessages)
-import Bag                 ( bagToList )
-import Outputable          ( showSDoc, panic, text, ($$) )
+import GHC.Data.Bag         ( bagToList )
+import GHC.Utils.Outputable ( showSDoc, panic, text, ($$) )
 import GHC.Types.SrcLoc
-import StringBuffer        ( StringBuffer, atEnd )
+import GHC.Data.StringBuffer ( StringBuffer, atEnd )
 
 import Haddock.Backends.Hyperlinker.Types as T
 import Haddock.GhcUtils
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs
index a83c935c..a6134cd2 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs
@@ -17,7 +17,7 @@ import GHC.Types.Module ( ModuleName, moduleNameString )
 import GHC.Types.Name   ( getOccString, isInternalName, Name, nameModule, nameUnique )
 import GHC.Types.SrcLoc
 import GHC.Types.Unique ( getKey )
-import Encoding ( utf8DecodeByteString )
+import GHC.Utils.Encoding ( utf8DecodeByteString )
 
 import System.FilePath.Posix ((</>))
 
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs
index b3ccf1be..17ba00f0 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs
@@ -21,7 +21,7 @@ import GHC
 import GHC.Iface.Ext.Types ( HieAST(..), HieType(..), HieArgs(..), TypeIndex, HieTypeFlat )
 import GHC.Iface.Type
 import GHC.Types.Name      ( getOccFS, getOccString )
-import Outputable          ( showSDoc )
+import GHC.Utils.Outputable( showSDoc )
 import GHC.Types.Var       ( VarBndr(..) )
 
 import System.FilePath.Posix ((</>), (<.>))
diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
index 560a0f40..c54cc459 100644
--- a/haddock-api/src/Haddock/Backends/LaTeX.hs
+++ b/haddock-api/src/Haddock/Backends/LaTeX.hs
@@ -21,16 +21,16 @@ import Documentation.Haddock.Markup
 import Haddock.Types
 import Haddock.Utils
 import Haddock.GhcUtils
-import Pretty hiding (Doc, quote)
-import qualified Pretty
+import GHC.Utils.Ppr hiding (Doc, quote)
+import qualified GHC.Utils.Ppr as Pretty
 
 import GHC.Types.Basic        ( PromotionFlag(..) )
 import GHC
 import GHC.Types.Name.Occurrence
 import GHC.Types.Name        ( nameOccName )
 import GHC.Types.Name.Reader ( rdrNameOcc )
-import FastString           ( unpackFS )
-import Outputable           ( panic)
+import GHC.Data.FastString   ( unpackFS )
+import GHC.Utils.Outputable  ( panic)
 
 import qualified Data.Map as Map
 import System.Directory
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index 153caf86..a8ff584d 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -38,7 +38,7 @@ import GHC.Types.Basic (PromotionFlag(..), isPromoted)
 import GHC hiding (LexicalFixity(..))
 import GHC.Exts
 import GHC.Types.Name
-import BooleanFormula
+import GHC.Data.BooleanFormula
 import GHC.Types.Name.Reader ( rdrNameOcc )
 
 -- | Pretty print a declaration
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs b/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
index e08bf575..21d544cd 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
@@ -49,7 +49,7 @@ import qualified Data.Map as Map
 import Text.XHtml hiding ( name, title, quote )
 import Data.Maybe (fromMaybe)
 
-import FastString            ( unpackFS )
+import GHC.Data.FastString ( unpackFS )
 import GHC
 import GHC.Types.Name (nameOccName)
 
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Names.hs b/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
index 6c5fecee..83279f70 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
@@ -29,7 +29,7 @@ import qualified Data.List as List
 import GHC hiding (LexicalFixity(..))
 import GHC.Types.Name
 import GHC.Types.Name.Reader
-import FastString (unpackFS)
+import GHC.Data.FastString (unpackFS)
 
 
 -- | Indicator of how to render a 'DocName' into 'Html'