diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2021-09-22 18:28:35 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-22 19:20:44 -0400 |
commit | 806e49ae36a058dbe4494055a6b936dd153c6194 (patch) | |
tree | 982c304986bf925187aae36997d4602e3419c8e9 /compiler/GHC/Plugins.hs | |
parent | 6fd7da745a518a93f6685171701a27283cfe2d4e (diff) | |
download | haskell-806e49ae36a058dbe4494055a6b936dd153c6194.tar.gz |
Refactor package imports
Use an (Raw)PkgQual datatype instead of `Maybe FastString` to represent
package imports. Factorize the code that renames RawPkgQual into PkgQual
in function `rnPkgQual`. Renaming consists in checking if the FastString
is the magic "this" keyword, the home-unit unit-id or something else.
Bump haddock submodule
Diffstat (limited to 'compiler/GHC/Plugins.hs')
-rw-r--r-- | compiler/GHC/Plugins.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/GHC/Plugins.hs b/compiler/GHC/Plugins.hs index 8af39b5743..95ae21aba7 100644 --- a/compiler/GHC/Plugins.hs +++ b/compiler/GHC/Plugins.hs @@ -15,6 +15,7 @@ module GHC.Plugins , module GHC.Types.Var , module GHC.Types.Id , module GHC.Types.Id.Info + , module GHC.Types.PkgQual , module GHC.Core.Opt.Monad , module GHC.Core , module GHC.Types.Literal @@ -29,6 +30,7 @@ module GHC.Plugins , module GHC.Driver.Ppr , module GHC.Unit.State , module GHC.Unit.Module + , module GHC.Unit.Home , module GHC.Core.Type , module GHC.Core.TyCon , module GHC.Core.Coercion @@ -66,6 +68,7 @@ import GHC.Driver.Plugins -- Variable naming import GHC.Types.TyThing +import GHC.Types.PkgQual import GHC.Types.SourceError import GHC.Types.Name.Reader import GHC.Types.Name.Occurrence hiding ( varName {- conflicts with Var.varName -} ) @@ -92,6 +95,7 @@ import GHC.Types.Meta import GHC.Driver.Session import GHC.Unit.State +import GHC.Unit.Home import GHC.Unit.Module import GHC.Unit.Module.ModGuts import GHC.Unit.Module.ModSummary |