Module hierarchy: Hs (#13009)

Add GHC.Hs module hierarchy replacing hsSyn.

Metric Increase:
    haddock.compiler

9 files changed, 14 insertions, 14 deletions

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 87f0d12667..a66daa220e 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -227,7 +227,7 @@ module GHC (
         TyThing(..),
 
         -- ** Syntax
-        module HsSyn, -- ToDo: remove extraneous bits
+        module GHC.Hs, -- ToDo: remove extraneous bits
 
         -- ** Fixities
         FixityDirection(..),
@@ -314,7 +314,7 @@ import TcRnTypes
 import Packages
 import NameSet
 import RdrName
-import HsSyn
+import GHC.Hs
 import Type     hiding( typeKind )
 import TcType
 import Id
diff --git a/compiler/main/GhcPlugins.hs b/compiler/main/GhcPlugins.hs
index 56492377d8..351f0b268a 100644
--- a/compiler/main/GhcPlugins.hs
+++ b/compiler/main/GhcPlugins.hs
@@ -90,7 +90,7 @@ import Data.Maybe
 import IfaceEnv         ( lookupOrigIO )
 import GhcPrelude
 import MonadUtils       ( mapMaybeM )
-import Convert          ( thRdrNameGuesses )
+import GHC.ThToHs       ( thRdrNameGuesses )
 import TcEnv            ( lookupGlobal )
 
 import qualified Language.Haskell.TH as TH
diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 0d7e6fd702..d534fab1d5 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -26,7 +26,7 @@ import HscTypes
 import Parser           ( parseHeader )
 import Lexer
 import FastString
-import HsSyn
+import GHC.Hs
 import Module
 import PrelNames
 import StringBuffer
diff --git a/compiler/main/Hooks.hs b/compiler/main/Hooks.hs
index f9d420ab61..a562b3e33f 100644
--- a/compiler/main/Hooks.hs
+++ b/compiler/main/Hooks.hs
@@ -28,9 +28,9 @@ import GhcPrelude
 import DynFlags
 import PipelineMonad
 import HscTypes
-import HsDecls
-import HsBinds
-import HsExpr
+import GHC.Hs.Decls
+import GHC.Hs.Binds
+import GHC.Hs.Expr
 import OrdList
 import TcRnTypes
 import Bag
@@ -43,7 +43,7 @@ import SrcLoc
 import Type
 import System.Process
 import BasicTypes
-import HsExtension
+import GHC.Hs.Extension
 
 import Data.Maybe
 
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index f2fc6e98d2..a9fe3ffe18 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -104,8 +104,8 @@ import Control.Concurrent
 import Module
 import Packages
 import RdrName
-import HsSyn
-import HsDumpAst
+import GHC.Hs
+import GHC.Hs.Dump
 import CoreSyn
 import StringBuffer
 import Parser
diff --git a/compiler/main/HscStats.hs b/compiler/main/HscStats.hs
index df77ae41a4..27f192227f 100644
--- a/compiler/main/HscStats.hs
+++ b/compiler/main/HscStats.hs
@@ -13,7 +13,7 @@ module HscStats ( ppSourceStats ) where
 import GhcPrelude
 
 import Bag
-import HsSyn
+import GHC.Hs
 import Outputable
 import SrcLoc
 import Util
diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs
index a9e9bcb363..274b777eec 100644
--- a/compiler/main/HscTypes.hs
+++ b/compiler/main/HscTypes.hs
@@ -155,7 +155,7 @@ import GHCi.RemoteTypes
 import GHC.ForeignSrcLang
 
 import UniqFM
-import HsSyn
+import GHC.Hs
 import RdrName
 import Avail
 import Module
diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs
index 88c8ecc7df..e7f3947210 100644
--- a/compiler/main/InteractiveEval.hs
+++ b/compiler/main/InteractiveEval.hs
@@ -53,7 +53,7 @@ import GHCi.Message
 import GHCi.RemoteTypes
 import GhcMonad
 import HscMain
-import HsSyn
+import GHC.Hs
 import HscTypes
 import InstEnv
 import IfaceEnv   ( newInteractiveBinder )
diff --git a/compiler/main/Plugins.hs b/compiler/main/Plugins.hs
index c787960dd6..66eebb9f63 100644
--- a/compiler/main/Plugins.hs
+++ b/compiler/main/Plugins.hs
@@ -53,7 +53,7 @@ import {-# SOURCE #-} CoreMonad ( CoreToDo, CoreM )
 import qualified TcRnTypes
 import TcRnTypes ( TcGblEnv, IfM, TcM, tcg_rn_decls, tcg_rn_exports  )
 import TcHoleFitTypes ( HoleFitPluginR )
-import HsSyn
+import GHC.Hs
 import DynFlags
 import HscTypes
 import GhcMonad