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 /ghc/Main.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 'ghc/Main.hs')
| -rw-r--r-- | ghc/Main.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs index b1c45e9cc4..5e6042173f 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -53,6 +53,7 @@ import GHC.Types.Basic ( failed ) import GHC.Types.SrcLoc import GHC.Types.SourceError import GHC.Types.Unique.Supply +import GHC.Types.PkgQual import GHC.Utils.Error import GHC.Utils.Misc @@ -881,7 +882,7 @@ abiHash strs = do let find_it str = do let modname = mkModuleName str - r <- findImportedModule fc fopts units home_unit modname Nothing + r <- findImportedModule fc fopts units home_unit modname NoPkgQual case r of Found _ m -> return m _error -> throwGhcException $ CmdLineError $ showSDoc dflags $ |