diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-02-04 21:49:05 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-02-06 11:53:31 -0500 |
| commit | bf8ba2525e95319bdbcfc81d06448b646eba3a57 (patch) | |
| tree | 83aac2bf137fccb8ae49916da9265b7b7fd41833 /haddock-api/src/Haddock/Backends | |
| parent | e1230ede3d1c77a6916e318aefcd47829e56035c (diff) | |
| parent | 1bdbf284b4ba20ee1738b13c4e3414384955f6f3 (diff) | |
Merge remote-tracking branch 'origin/ghc-head' into wip/ghc-head-merge
Diffstat (limited to 'haddock-api/src/Haddock/Backends')
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs | 4 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml.hs | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs index d3f3b79b..52d73265 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs @@ -12,7 +12,7 @@ import qualified Data.ByteString as BS import GHC.Types.SourceText import GHC.Driver.Session -import GHC.Utils.Error ( pprLocErrMsg ) +import GHC.Utils.Error ( pprLocMsgEnvelope ) import GHC.Data.FastString ( mkFastString ) import GHC.Parser.Errors.Ppr ( pprError ) import GHC.Parser.Lexer as Lexer @@ -42,7 +42,7 @@ parse dflags fpath bs = case unP (go False []) initState of PFailed pst -> let err:_ = bagToList (fmap pprError (getErrorMessages pst)) in panic $ showSDoc dflags $ - text "Hyperlinker parse error:" $$ pprLocErrMsg err + text "Hyperlinker parse error:" $$ pprLocMsgEnvelope err where initState = initParserState pflags buf start diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs index f8c22e0a..1bdbf81b 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml.hs @@ -223,10 +223,7 @@ moduleInfo iface = ("Language", lg) ] ++ extsForm where - lg inf = case hmi_language inf of - Nothing -> Nothing - Just Haskell98 -> Just "Haskell98" - Just Haskell2010 -> Just "Haskell2010" + lg inf = fmap show (hmi_language inf) multilineRow :: String -> [String] -> HtmlTable multilineRow title xs = (th ! [valign "top"]) << title <-> td << (toLines xs) |