diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-14 13:52:44 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-05-24 01:55:24 -0400 |
commit | a426abb9b41de6097e888b9fdca7b275306b17c9 (patch) | |
tree | 0ffe12ea44262510e2bf3f1ce979849aef9fd171 /compiler/GHC/Hs | |
parent | 37430251c3f684c46e893552dba78653d80e5243 (diff) | |
download | haskell-a426abb9b41de6097e888b9fdca7b275306b17c9.tar.gz |
Rename GHC.Hs.Types into GHC.Hs.Type
See discussion in https://gitlab.haskell.org/ghc/ghc/issues/13009#note_268610
Diffstat (limited to 'compiler/GHC/Hs')
-rw-r--r-- | compiler/GHC/Hs/Binds.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Hs/Decls.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Hs/Expr.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Hs/Instances.hs | 4 | ||||
-rw-r--r-- | compiler/GHC/Hs/Pat.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Hs/Type.hs (renamed from compiler/GHC/Hs/Types.hs) | 4 | ||||
-rw-r--r-- | compiler/GHC/Hs/Utils.hs | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/compiler/GHC/Hs/Binds.hs b/compiler/GHC/Hs/Binds.hs index ccc5a8d422..0f4a16c98e 100644 --- a/compiler/GHC/Hs/Binds.hs +++ b/compiler/GHC/Hs/Binds.hs @@ -31,7 +31,7 @@ import {-# SOURCE #-} GHC.Hs.Expr ( pprExpr, LHsExpr, import {-# SOURCE #-} GHC.Hs.Pat ( LPat ) import GHC.Hs.Extension -import GHC.Hs.Types +import GHC.Hs.Type import GHC.Core import GHC.Tc.Types.Evidence import GHC.Core.Type diff --git a/compiler/GHC/Hs/Decls.hs b/compiler/GHC/Hs/Decls.hs index 6dfe75005e..931c9b218f 100644 --- a/compiler/GHC/Hs/Decls.hs +++ b/compiler/GHC/Hs/Decls.hs @@ -101,7 +101,7 @@ import {-# SOURCE #-} GHC.Hs.Expr( HsExpr, HsSplice, pprExpr, -- Because Expr imports Decls via HsBracket import GHC.Hs.Binds -import GHC.Hs.Types +import GHC.Hs.Type import GHC.Hs.Doc import GHC.Core.TyCon import GHC.Types.Basic diff --git a/compiler/GHC/Hs/Expr.hs b/compiler/GHC/Hs/Expr.hs index 2ef0d62db4..880277d8fd 100644 --- a/compiler/GHC/Hs/Expr.hs +++ b/compiler/GHC/Hs/Expr.hs @@ -33,7 +33,7 @@ import GHC.Hs.Decls import GHC.Hs.Pat import GHC.Hs.Lit import GHC.Hs.Extension -import GHC.Hs.Types +import GHC.Hs.Type import GHC.Hs.Binds -- others: diff --git a/compiler/GHC/Hs/Instances.hs b/compiler/GHC/Hs/Instances.hs index a003a6b885..a5588f31d2 100644 --- a/compiler/GHC/Hs/Instances.hs +++ b/compiler/GHC/Hs/Instances.hs @@ -22,7 +22,7 @@ import GHC.Hs.Binds import GHC.Hs.Decls import GHC.Hs.Expr import GHC.Hs.Lit -import GHC.Hs.Types +import GHC.Hs.Type import GHC.Hs.Pat import GHC.Hs.ImpExp @@ -369,7 +369,7 @@ deriving instance (Data body) => Data (HsRecFields GhcRn body) deriving instance (Data body) => Data (HsRecFields GhcTc body) -- --------------------------------------------------------------------- --- Data derivations from GHC.Hs.Types ---------------------------------- +-- Data derivations from GHC.Hs.Type ---------------------------------- -- deriving instance (DataIdLR p p) => Data (LHsQTyVars p) deriving instance Data (LHsQTyVars GhcPs) diff --git a/compiler/GHC/Hs/Pat.hs b/compiler/GHC/Hs/Pat.hs index 7b279ef3e1..241e3c59e0 100644 --- a/compiler/GHC/Hs/Pat.hs +++ b/compiler/GHC/Hs/Pat.hs @@ -58,7 +58,7 @@ import {-# SOURCE #-} GHC.Hs.Expr (SyntaxExpr, LHsExpr, HsSplice, pprLExpr, pprS import GHC.Hs.Binds import GHC.Hs.Lit import GHC.Hs.Extension -import GHC.Hs.Types +import GHC.Hs.Type import GHC.Tc.Types.Evidence import GHC.Types.Basic -- others: diff --git a/compiler/GHC/Hs/Types.hs b/compiler/GHC/Hs/Type.hs index 2bb4d11240..977e790a97 100644 --- a/compiler/GHC/Hs/Types.hs +++ b/compiler/GHC/Hs/Type.hs @@ -3,7 +3,7 @@ (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 -GHC.Hs.Types: Abstract syntax: user-defined types +GHC.Hs.Type: Abstract syntax: user-defined types -} {-# LANGUAGE DeriveDataTypeable #-} @@ -17,7 +17,7 @@ GHC.Hs.Types: Abstract syntax: user-defined types {-# LANGUAGE CPP #-} {-# LANGUAGE TypeFamilies #-} -module GHC.Hs.Types ( +module GHC.Hs.Type ( HsType(..), NewHsTypeX(..), LHsType, HsKind, LHsKind, HsTyVarBndr(..), LHsTyVarBndr, ForallVisFlag(..), LHsQTyVars(..), diff --git a/compiler/GHC/Hs/Utils.hs b/compiler/GHC/Hs/Utils.hs index 6301927b26..cbb21b1ad0 100644 --- a/compiler/GHC/Hs/Utils.hs +++ b/compiler/GHC/Hs/Utils.hs @@ -110,7 +110,7 @@ import GHC.Hs.Decls import GHC.Hs.Binds import GHC.Hs.Expr import GHC.Hs.Pat -import GHC.Hs.Types +import GHC.Hs.Type import GHC.Hs.Lit import GHC.Hs.Extension @@ -745,7 +745,7 @@ typeToLHsType ty argf_to_spec :: ArgFlag -> Specificity argf_to_spec Required = SpecifiedSpec - -- see Note [Specificity in HsForAllTy] in GHC.Hs.Types + -- see Note [Specificity in HsForAllTy] in GHC.Hs.Type argf_to_spec (Invisible s) = s go_tv :: TyVarBinder -> LHsTyVarBndr Specificity GhcPs |