diff options
| author | Alfredo Di Napoli <alfredo@well-typed.com> | 2021-06-30 15:17:46 +0200 |
|---|---|---|
| committer | Alfredo Di Napoli <alfredo@well-typed.com> | 2021-07-08 08:13:23 +0200 |
| commit | 56eb57a6b348d44370fc84f6a35caabd1c548b5e (patch) | |
| tree | be873cadaa3f9ec47c41546d2577d61810038313 /utils/check-exact/Preprocess.hs | |
| parent | 5a31abe3544c21d0b45d264ea68f89bbb108251d (diff) | |
| download | haskell-wip/adinapoli-issue-19920.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 'utils/check-exact/Preprocess.hs')
| -rw-r--r-- | utils/check-exact/Preprocess.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/check-exact/Preprocess.hs b/utils/check-exact/Preprocess.hs index 9d7e883aad..f95668141c 100644 --- a/utils/check-exact/Preprocess.hs +++ b/utils/check-exact/Preprocess.hs @@ -24,7 +24,7 @@ import qualified GHC.Driver.Errors.Types as GHC import qualified GHC.Driver.Phases as GHC import qualified GHC.Driver.Pipeline as GHC import qualified GHC.Fingerprint.Type as GHC -import qualified GHC.Parser.Lexer as GHC hiding (getMessages) +import qualified GHC.Parser.Lexer as GHC import qualified GHC.Settings as GHC import qualified GHC.Types.Error as GHC (getMessages) import qualified GHC.Types.SourceError as GHC @@ -283,7 +283,7 @@ parseError pst = do let -- (warns,errs) = GHC.getMessages pst dflags -- throw $ GHC.mkSrcErr (GHC.unitBag $ GHC.mkPlainErrMsg dflags sspan err) - GHC.throwErrors $ (GHC.GhcPsMessage <$> GHC.getErrorMessages pst) + GHC.throwErrors $ (GHC.GhcPsMessage <$> GHC.getPsErrorMessages pst) -- --------------------------------------------------------------------- |