Merge remote-tracking branch 'origin/ghc-head' into wip/ttg-con-pat

9 files changed, 15 insertions, 16 deletions

diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs
index 0bdd4b2c..87f83cfe 100644
--- a/haddock-api/src/Haddock.hs
+++ b/haddock-api/src/Haddock.hs
@@ -62,7 +62,6 @@ import qualified GHC.Paths as GhcPaths
 import Paths_haddock_api (getDataDir)
 #endif
 import System.Directory (doesDirectoryExist, getTemporaryDirectory)
-import System.FilePath ((</>))
 
 import Text.ParserCombinators.ReadP (readP_to_S)
 import GHC hiding (verbosity)
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
index 82d15d62..ddf70b5f 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
@@ -11,10 +11,11 @@ import qualified Data.ByteString as BS
 
 import GHC.Types.Basic     ( IntegralLit(..) )
 import GHC.Driver.Session
-import ErrUtils            ( emptyMessages, pprLocErrMsg )
+import ErrUtils            ( pprLocErrMsg )
 import FastString          ( mkFastString )
-import Lexer               ( P(..), ParseResult(..), PState(..), Token(..)
-                           , mkPStatePure, lexer, mkParserFlags', getErrorMessages, addFatalError )
+import GHC.Parser.Lexer    as Lexer
+                           ( P(..), ParseResult(..), PState(..), Token(..)
+                           , mkPStatePure, lexer, mkParserFlags', getErrorMessages)
 import Bag                 ( bagToList )
 import Outputable          ( showSDoc, panic, text, ($$) )
 import GHC.Types.SrcLoc
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index c22afeed..153caf86 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -40,7 +40,6 @@ import GHC.Exts
 import GHC.Types.Name
 import BooleanFormula
 import GHC.Types.Name.Reader ( rdrNameOcc )
-import Outputable ( panic )
 
 -- | Pretty print a declaration
 ppDecl :: Bool                                     -- ^ print summary info only
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index 6a0bba61..ceb6916e 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -38,10 +38,10 @@ import GHC.Tc.Utils.TcType
 import GHC.Core.TyCon
 import GHC.Core.Type
 import GHC.Core.TyCo.Rep
-import TysPrim ( alphaTyVars )
-import TysWiredIn ( eqTyConName, listTyConName, liftedTypeKindTyConName
+import GHC.Builtin.Types.Prim ( alphaTyVars )
+import GHC.Builtin.Types ( eqTyConName, listTyConName, liftedTypeKindTyConName
                   , unitTy, promotedNilDataCon, promotedConsDataCon )
-import PrelNames ( hasKey, eqTyConKey, ipClassKey, tYPETyConKey
+import GHC.Builtin.Names ( hasKey, eqTyConKey, ipClassKey, tYPETyConKey
                  , liftedRepDataConKey )
 import GHC.Types.Unique ( getUnique )
 import Util ( chkAppend,dropList, filterByList, filterOut )
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
index 6b62f3d3..f681c1dc 100644
--- a/haddock-api/src/Haddock/GhcUtils.hs
+++ b/haddock-api/src/Haddock/GhcUtils.hs
@@ -40,7 +40,7 @@ import GHC.Types.Var.Set ( VarSet, emptyVarSet )
 import GHC.Types.Var.Env ( TyVarEnv, extendVarEnv, elemVarEnv, emptyVarEnv )
 import GHC.Core.TyCo.Rep ( Type(..) )
 import GHC.Core.Type     ( isRuntimeRepVar )
-import TysWiredIn( liftedRepDataConTyCon )
+import GHC.Builtin.Types( liftedRepDataConTyCon )
 import GHC.Hs.Utils (CollectPass(..))
 
 import           StringBuffer ( StringBuffer )
@@ -613,7 +613,7 @@ orderedFVs vs tys =
 --
 -- >>> import GHC.Types.Name
 -- >>> import TyCoRep
--- >>> import TysPrim
+-- >>> import GHC.Builtin.Types.Prim
 -- >>> import GHC.Types.Var
 -- >>> a = TyVarTy alphaTyVar
 -- >>> b = TyVarTy betaTyVar
diff --git a/haddock-api/src/Haddock/Interface/AttachInstances.hs b/haddock-api/src/Haddock/Interface/AttachInstances.hs
index 5bec4d34..00e9aabb 100644
--- a/haddock-api/src/Haddock/Interface/AttachInstances.hs
+++ b/haddock-api/src/Haddock/Interface/AttachInstances.hs
@@ -42,7 +42,7 @@ import Outputable (text, sep, (<+>))
 import GHC.Types.SrcLoc
 import GHC.Core.TyCon
 import GHC.Core.TyCo.Rep
-import TysPrim( funTyConName )
+import GHC.Builtin.Types.Prim( funTyConName )
 import GHC.Types.Var hiding (varName)
 
 type ExportedNames = Set.Set Name
diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
index a4dda417..4ca4a13d 100644
--- a/haddock-api/src/Haddock/Interface/Rename.hs
+++ b/haddock-api/src/Haddock/Interface/Rename.hs
@@ -24,7 +24,7 @@ import GHC hiding (NoLink)
 import GHC.Types.Name
 import Outputable ( panic )
 import GHC.Types.Name.Reader (RdrName(Exact))
-import TysWiredIn (eqTyCon_RDR)
+import GHC.Builtin.Types (eqTyCon_RDR)
 
 import Control.Applicative
 import Control.Arrow ( first )
diff --git a/haddock-api/src/Haddock/Interface/Specialize.hs b/haddock-api/src/Haddock/Interface/Specialize.hs
index d79b61d9..52cbcdbf 100644
--- a/haddock-api/src/Haddock/Interface/Specialize.hs
+++ b/haddock-api/src/Haddock/Interface/Specialize.hs
@@ -15,8 +15,8 @@ import Haddock.Types
 import GHC
 import GHC.Types.Name
 import FastString
-import TysPrim ( funTyConName )
-import TysWiredIn ( listTyConName )
+import GHC.Builtin.Types.Prim ( funTyConName )
+import GHC.Builtin.Types ( listTyConName )
 
 import Control.Monad
 import Control.Monad.Trans.State
diff --git a/haddock-api/src/Haddock/Parser.hs b/haddock-api/src/Haddock/Parser.hs
index f9bb445c..cf66cd1a 100644
--- a/haddock-api/src/Haddock/Parser.hs
+++ b/haddock-api/src/Haddock/Parser.hs
@@ -18,8 +18,8 @@ import Documentation.Haddock.Types
 
 import GHC.Driver.Session ( DynFlags )
 import FastString   ( fsLit )
-import Lexer        ( mkPState, unP, ParseResult(POk) )
-import Parser       ( parseIdentifier )
+import GHC.Parser.Lexer ( mkPState, unP, ParseResult(POk) )
+import GHC.Parser       ( parseIdentifier )
 import GHC.Types.Name.Reader ( RdrName )
 import GHC.Types.SrcLoc ( mkRealSrcLoc, unLoc )
 import StringBuffer ( stringToStringBuffer )