summaryrefslogtreecommitdiff
path: root/compiler/GHC/Parser/Header.hs
diff options
context:
space:
mode:
authorAlfredo Di Napoli <alfredo@well-typed.com>2021-06-30 15:17:46 +0200
committerAlfredo Di Napoli <alfredo@well-typed.com>2021-07-08 08:13:23 +0200
commit56eb57a6b348d44370fc84f6a35caabd1c548b5e (patch)
treebe873cadaa3f9ec47c41546d2577d61810038313 /compiler/GHC/Parser/Header.hs
parent5a31abe3544c21d0b45d264ea68f89bbb108251d (diff)
downloadhaskell-56eb57a6b348d44370fc84f6a35caabd1c548b5e.tar.gz
Rename getErrorMessages and getMessages function in parser codewip/adinapoli-issue-19920
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
Diffstat (limited to 'compiler/GHC/Parser/Header.hs')
-rw-r--r--compiler/GHC/Parser/Header.hs6
1 files changed, 3 insertions, 3 deletions
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)