From 56eb57a6b348d44370fc84f6a35caabd1c548b5e Mon Sep 17 00:00:00 2001 From: Alfredo Di Napoli Date: Wed, 30 Jun 2021 15:17:46 +0200 Subject: Rename getErrorMessages and getMessages function in parser code This commit renames the `getErrorMessages` and `getMessages` function in the parser code to `getPsErrorMessages` and `getPsMessages`, to avoid import conflicts, as we have already `getErrorMessages` and `getMessages` defined in `GHC.Types.Error`. Fixes #19920. Update haddock submodule --- compiler/GHC/Parser/Header.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/GHC/Parser/Header.hs') diff --git a/compiler/GHC/Parser/Header.hs b/compiler/GHC/Parser/Header.hs index 2037f6bc48..65e09bfeff 100644 --- a/compiler/GHC/Parser/Header.hs +++ b/compiler/GHC/Parser/Header.hs @@ -33,7 +33,7 @@ import GHC.Hs import GHC.Unit.Module import GHC.Builtin.Names -import GHC.Types.Error hiding ( getErrorMessages, getWarningMessages, getMessages ) +import GHC.Types.Error import GHC.Types.SrcLoc import GHC.Types.SourceError import GHC.Types.SourceText @@ -83,9 +83,9 @@ getImports popts implicit_prelude buf filename source_filename = do case unP parseHeader (initParserState popts buf loc) of PFailed pst -> -- assuming we're not logging warnings here as per below - return $ Left $ getErrorMessages pst + return $ Left $ getPsErrorMessages pst POk pst rdr_module -> fmap Right $ do - let (_warns, errs) = getMessages pst + let (_warns, errs) = getPsMessages pst -- don't log warnings: they'll be reported when we parse the file -- for real. See #2500. if not (isEmptyMessages errs) -- cgit v1.2.1