Merge commit '3c2944c037263b426c4fe60a3424c27b852ea71c' into HEAD

More changes from the GHC types module refactoring.

4 files changed, 5 insertions, 5 deletions

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