Rename GHC.Hs.Types into GHC.Hs.Type

See discussion in https://gitlab.haskell.org/ghc/ghc/issues/13009#note_268610

5 files changed, 9 insertions, 9 deletions

diff --git a/compiler/GHC/Tc/Gen/HsType.hs b/compiler/GHC/Tc/Gen/HsType.hs
index 328ed43d65..a3218936a6 100644
--- a/compiler/GHC/Tc/Gen/HsType.hs
+++ b/compiler/GHC/Tc/Gen/HsType.hs
@@ -427,7 +427,7 @@ argument, which we do not want because users should be able to write
 solution is to switch the PartialTypeSignatures flags here to let the
 typechecker know that it's checking a '@_' and do not emit hole
 constraints on it.  See related Note [Wildcards in visible kind
-application] and Note [The wildcard story for types] in GHC.Hs.Types
+application] and Note [The wildcard story for types] in GHC.Hs.Type
 
 Ugh!
 
@@ -772,7 +772,7 @@ tc_hs_type mode rn_ty@(HsListTy _ elt_ty) exp_kind
        ; checkWiredInTyCon listTyCon
        ; checkExpectedKind rn_ty (mkListTy tau_ty) liftedTypeKind exp_kind }
 
--- See Note [Distinguishing tuple kinds] in GHC.Hs.Types
+-- See Note [Distinguishing tuple kinds] in GHC.Hs.Type
 -- See Note [Inferring tuple kinds]
 tc_hs_type mode rn_ty@(HsTupleTy _ HsBoxedOrConstraintTuple hs_tys) exp_kind
      -- (NB: not zonking before looking at exp_k, to avoid left-right bias)
@@ -953,7 +953,7 @@ And whenever we see a '@', we automatically turn on PartialTypeSignatures and
 turn off hole constraint warnings, and do not call emitAnonTypeHole
 under these conditions.
 See related Note [Wildcards in visible type application] here and
-Note [The wildcard story for types] in GHC.Hs.Types
+Note [The wildcard story for types] in GHC.Hs.Type
 
 Note [Skolem escape and forall-types]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1842,7 +1842,7 @@ tcNamedWildCardBinders :: [Name]
                        -> TcM a
 -- Bring into scope the /named/ wildcard binders.  Remember that
 -- plain wildcards _ are anonymous and dealt with by HsWildCardTy
--- Soe Note [The wildcard story for types] in GHC.Hs.Types
+-- Soe Note [The wildcard story for types] in GHC.Hs.Type
 tcNamedWildCardBinders wc_names thing_inside
   = do { wcs <- mapM (const newWildTyVar) wc_names
        ; let wc_prs = wc_names `zip` wcs
@@ -3390,7 +3390,7 @@ tcHsPatSigType :: UserTypeCtxt
 -- Used for type-checking type signatures in
 -- (a) patterns           e.g  f (x::Int) = e
 -- (b) RULE forall bndrs  e.g. forall (x::Int). f x = x
--- See Note [Pattern signature binders and scoping] in GHC.Hs.Types
+-- See Note [Pattern signature binders and scoping] in GHC.Hs.Type
 --
 -- This may emit constraints
 -- See Note [Recipe for checking a signature]
diff --git a/compiler/GHC/Tc/Gen/Splice.hs b/compiler/GHC/Tc/Gen/Splice.hs
index aa792ee6b7..8a7b1b0c7f 100644
--- a/compiler/GHC/Tc/Gen/Splice.hs
+++ b/compiler/GHC/Tc/Gen/Splice.hs
@@ -2128,7 +2128,7 @@ reify_for_all argf ty = do
   case argToForallVisFlag argf of
     ForallVis   -> do phi' <- reifyType phi
                       let tvs = map (() <$) tvbndrs'
-                      -- see Note [Specificity in HsForAllTy] in GHC.Hs.Types
+                      -- see Note [Specificity in HsForAllTy] in GHC.Hs.Type
                       pure $ TH.ForallVisT tvs phi'
     ForallInvis -> do let (cxt, tau) = tcSplitPhiTy phi
                       cxt' <- reifyCxt cxt
diff --git a/compiler/GHC/Tc/Solver/Canonical.hs b/compiler/GHC/Tc/Solver/Canonical.hs
index 57cf913aa4..4e828c919c 100644
--- a/compiler/GHC/Tc/Solver/Canonical.hs
+++ b/compiler/GHC/Tc/Solver/Canonical.hs
@@ -38,7 +38,7 @@ import GHC.Utils.Outputable
 import GHC.Driver.Session( DynFlags )
 import GHC.Types.Name.Set
 import GHC.Types.Name.Reader
-import GHC.Hs.Types( HsIPName(..) )
+import GHC.Hs.Type( HsIPName(..) )
 
 import GHC.Data.Pair
 import GHC.Utils.Misc
diff --git a/compiler/GHC/Tc/Utils/TcMType.hs b/compiler/GHC/Tc/Utils/TcMType.hs
index 90598e42c4..d06307263d 100644
--- a/compiler/GHC/Tc/Utils/TcMType.hs
+++ b/compiler/GHC/Tc/Utils/TcMType.hs
@@ -554,7 +554,7 @@ tcInstTypeBndrs inst_tyvars id =
   where
     argf_to_spec :: VarBndr TyCoVar ArgFlag -> VarBndr TyCoVar Specificity
     argf_to_spec (Bndr tv Required)      = Bndr tv SpecifiedSpec
-    -- see Note [Specificity in HsForAllTy] in GHC.Hs.Types
+    -- see Note [Specificity in HsForAllTy] in GHC.Hs.Type
     argf_to_spec (Bndr tv (Invisible s)) = Bndr tv s
 
 tcSkolDFunType :: DFunId -> TcM ([TcTyVar], TcThetaType, TcType)
diff --git a/compiler/GHC/Tc/Utils/Unify.hs-boot b/compiler/GHC/Tc/Utils/Unify.hs-boot
index 36f3367634..311dbf66aa 100644
--- a/compiler/GHC/Tc/Utils/Unify.hs-boot
+++ b/compiler/GHC/Tc/Utils/Unify.hs-boot
@@ -5,7 +5,7 @@ import GHC.Tc.Utils.TcType   ( TcTauType )
 import GHC.Tc.Types          ( TcM )
 import GHC.Tc.Types.Evidence ( TcCoercion )
 import GHC.Hs.Expr      ( HsExpr )
-import GHC.Hs.Types     ( HsType )
+import GHC.Hs.Type     ( HsType )
 import GHC.Hs.Extension ( GhcRn )
 
 -- This boot file exists only to tie the knot between