Merge commit '3c2944c037263b426c4fe60a3424c27b852ea71c' into HEAD

More changes from the GHC types module refactoring.

11 files changed, 16 insertions, 16 deletions

diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
index a3f4c4e9..98b13756 100644
--- a/haddock-api/src/Haddock/Backends/LaTeX.hs
+++ b/haddock-api/src/Haddock/Backends/LaTeX.hs
@@ -26,9 +26,9 @@ import qualified Pretty
 
 import GHC.Types.Basic        ( PromotionFlag(..) )
 import GHC
-import GHC.Types.Name.OccName
-import GHC.Types.Name         ( nameOccName )
-import GHC.Types.Name.RdrName ( rdrNameOcc )
+import GHC.Types.Name.Occurrence
+import GHC.Types.Name        ( nameOccName )
+import GHC.Types.Name.Reader ( rdrNameOcc )
 import FastString           ( unpackFS )
 import Outputable           ( panic)
 
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index 265a675f..97db7b86 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -39,7 +39,7 @@ import GHC hiding (LexicalFixity(..))
 import GHC.Exts
 import GHC.Types.Name
 import BooleanFormula
-import GHC.Types.Name.RdrName ( rdrNameOcc )
+import GHC.Types.Name.Reader ( rdrNameOcc )
 import Outputable ( panic )
 
 -- | Pretty print a declaration
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Names.hs b/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
index 193d5afc..6c5fecee 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
@@ -28,7 +28,7 @@ import qualified Data.List as List
 
 import GHC hiding (LexicalFixity(..))
 import GHC.Types.Name
-import GHC.Types.Name.RdrName
+import GHC.Types.Name.Reader
 import FastString (unpackFS)
 
 
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index 97e9f967..ac6858c4 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -30,8 +30,8 @@ import GHC.Core.DataCon
 import GHC.Core.FamInstEnv
 import GHC.Hs
 import GHC.Types.Name
-import GHC.Types.Name.Set     ( emptyNameSet )
-import GHC.Types.Name.RdrName ( mkVarUnqual )
+import GHC.Types.Name.Set    ( emptyNameSet )
+import GHC.Types.Name.Reader ( mkVarUnqual )
 import GHC.Core.PatSyn
 import GHC.Types.SrcLoc ( Located, noLoc, unLoc, GenLocated(..), srcLocSpan )
 import TcType
diff --git a/haddock-api/src/Haddock/Interface.hs b/haddock-api/src/Haddock/Interface.hs
index 0ff95877..ef94cf5c 100644
--- a/haddock-api/src/Haddock/Interface.hs
+++ b/haddock-api/src/Haddock/Interface.hs
@@ -58,8 +58,8 @@ import GHC.Driver.Types
 import FastString (unpackFS)
 import TcRnTypes (tcg_rdr_env)
 import GHC.Types.Name (nameIsFromExternalPackage, nameOccName)
-import GHC.Types.Name.OccName (isTcOcc)
-import GHC.Types.Name.RdrName (unQualOK, gre_name, globalRdrEnvElts)
+import GHC.Types.Name.Occurrence (isTcOcc)
+import GHC.Types.Name.Reader (unQualOK, gre_name, globalRdrEnvElts)
 import ErrUtils (withTimingD)
 
 #if defined(mingw32_HOST_OS)
diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs
index cfd53a53..8227a6a3 100644
--- a/haddock-api/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
@@ -51,7 +51,7 @@ import GHC.Types.Name.Set
 import GHC.Types.Name.Env
 import GHC.Driver.Packages   ( lookupModuleInAllPackages, PackageName(..) )
 import Bag
-import GHC.Types.Name.RdrName
+import GHC.Types.Name.Reader
 import TcRnTypes
 import FastString ( unpackFS, bytesFS )
 import GHC.Types.Basic ( StringLiteral(..), SourceText(..), PromotionFlag(..) )
@@ -869,7 +869,7 @@ availExportItem is_sig modMap thisMod semMod warnings exportedNames
         constructor_names =
           filter isDataConName (availSubordinates avail)
 
--- this heavily depends on the invariants stated in GHC.Types.Avail
+-- this heavily depends on the invariants stated in Avail
 availExportsDecl :: AvailInfo -> Bool
 availExportsDecl (AvailTC ty_name names _)
   | n : _ <- names = ty_name == n
diff --git a/haddock-api/src/Haddock/Interface/LexParseRn.hs b/haddock-api/src/Haddock/Interface/LexParseRn.hs
index 8a5a5594..22279614 100644
--- a/haddock-api/src/Haddock/Interface/LexParseRn.hs
+++ b/haddock-api/src/Haddock/Interface/LexParseRn.hs
@@ -33,7 +33,7 @@ import Haddock.Parser
 import Haddock.Types
 import GHC.Types.Name
 import Outputable ( showPpr, showSDoc )
-import GHC.Types.Name.RdrName
+import GHC.Types.Name.Reader
 import EnumSet
 import GHC.Rename.Env (dataTcOccs)
 
diff --git a/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs b/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
index cfe2d9d8..611d8b6f 100644
--- a/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
+++ b/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
@@ -16,7 +16,7 @@ import Data.Char
 import GHC.Driver.Session
 import Haddock.Parser
 import Haddock.Types
-import GHC.Types.Name.RdrName
+import GHC.Types.Name.Reader
 
 -- -----------------------------------------------------------------------------
 -- Parsing module headers
diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
index 78c0c01b..47aeb31a 100644
--- a/haddock-api/src/Haddock/Interface/Rename.hs
+++ b/haddock-api/src/Haddock/Interface/Rename.hs
@@ -23,7 +23,7 @@ import Bag (emptyBag)
 import GHC hiding (NoLink)
 import GHC.Types.Name
 import Outputable ( panic )
-import GHC.Types.Name.RdrName (RdrName(Exact))
+import GHC.Types.Name.Reader (RdrName(Exact))
 import TysWiredIn (eqTyCon_RDR)
 
 import Control.Applicative
diff --git a/haddock-api/src/Haddock/Parser.hs b/haddock-api/src/Haddock/Parser.hs
index b4923e3b..f9bb445c 100644
--- a/haddock-api/src/Haddock/Parser.hs
+++ b/haddock-api/src/Haddock/Parser.hs
@@ -20,7 +20,7 @@ import GHC.Driver.Session ( DynFlags )
 import FastString   ( fsLit )
 import Lexer        ( mkPState, unP, ParseResult(POk) )
 import Parser       ( parseIdentifier )
-import GHC.Types.Name.RdrName ( RdrName )
+import GHC.Types.Name.Reader ( RdrName )
 import GHC.Types.SrcLoc ( mkRealSrcLoc, unLoc )
 import StringBuffer ( stringToStringBuffer )
 
diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
index c99fc271..f30071b7 100644
--- a/haddock-api/src/Haddock/Types.hs
+++ b/haddock-api/src/Haddock/Types.hs
@@ -41,7 +41,7 @@ import GHC.Types.Basic (Fixity(..), PromotionFlag(..))
 import GHC
 import GHC.Driver.Session (Language)
 import qualified GHC.LanguageExtensions as LangExt
-import GHC.Types.Name.OccName
+import GHC.Types.Name.Occurrence
 import Outputable
 
 -----------------------------------------------------------------------------