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 /utils | |
| 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 'utils')
| -rw-r--r-- | utils/check-exact/ExactPrint.hs | 3 | ||||
| m--------- | utils/haddock | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/utils/check-exact/ExactPrint.hs b/utils/check-exact/ExactPrint.hs index 9de262547e..488fad1ca4 100644 --- a/utils/check-exact/ExactPrint.hs +++ b/utils/check-exact/ExactPrint.hs @@ -29,6 +29,7 @@ import GHC.Types.Basic hiding (EP) import GHC.Types.Fixity import GHC.Types.ForeignCall import GHC.Types.SourceText +import GHC.Types.PkgQual import GHC.Types.Var import GHC.Utils.Outputable hiding ( (<>) ) import GHC.Unit.Module.Warnings @@ -760,7 +761,7 @@ instance ExactPrint (ImportDecl GhcPs) where -> printStringAtMkw (importDeclAnnQualified an) "qualified" _ -> return () case mpkg of - Just (StringLiteral src v _) -> + RawPkgQual (StringLiteral src v _) -> printStringAtMkw (importDeclAnnPackage an) (sourceTextToString src (show v)) _ -> return () diff --git a/utils/haddock b/utils/haddock -Subproject a0938c6c48ecf8d324b636d178b2139a2d3396f +Subproject d8b79d35ddd96c83f4a3a0303011defc209aa31 |