aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-03-31 12:24:56 -0400
committerBen Gamari <ben@smart-cactus.org>2021-03-31 12:24:56 -0400
commiteebc74dc08987fdd9b1c289be38207af9b0334c0 (patch)
treeb64b36a5dad15605ddb4c0d9fb0be0e5a5631d1c
parentc623c7d2df417caac4b72b747ef5262d86ee776a (diff)
parente0aa493cc4f881166258ee6fdcd6bd208e18ab0e (diff)
Merge remote-tracking branch 'upstream/ghc-head' into ghc-head
-rw-r--r--haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
index d9a2e0cd..e6748937 100644
--- a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
+++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
@@ -14,7 +14,7 @@ import GHC.Types.SourceText
import GHC.Driver.Session
import GHC.Utils.Error ( pprLocMsgEnvelope )
import GHC.Data.FastString ( mkFastString )
-import GHC.Parser.Errors.Ppr ( pprError )
+import GHC.Parser.Errors.Ppr ( mkParserErr )
import GHC.Parser.Lexer as Lexer
( P(..), ParseResult(..), PState(..), Token(..)
, initParserState, lexer, mkParserOpts, getErrorMessages)
@@ -40,7 +40,7 @@ parse
parse dflags fpath bs = case unP (go False []) initState of
POk _ toks -> reverse toks
PFailed pst ->
- let err:_ = bagToList (fmap pprError (getErrorMessages pst)) in
+ let err:_ = bagToList (fmap mkParserErr (getErrorMessages pst)) in
panic $ showSDoc dflags $
text "Hyperlinker parse error:" $$ pprLocMsgEnvelope err
where