From 806e49ae36a058dbe4494055a6b936dd153c6194 Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Wed, 22 Sep 2021 18:28:35 +0200 Subject: 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 --- utils/check-exact/ExactPrint.hs | 3 ++- utils/haddock | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'utils') 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 index a0938c6c48..d8b79d35dd 160000 --- a/utils/haddock +++ b/utils/haddock @@ -1 +1 @@ -Subproject commit a0938c6c48ecf8d324b636d178b2139a2d3396f2 +Subproject commit d8b79d35ddd96c83f4a3a0303011defc209aa318 -- cgit v1.2.1