diff options
| author | Cale Gibbard <cgibbard@gmail.com> | 2020-04-20 11:30:38 -0400 |
|---|---|---|
| committer | Cale Gibbard <cgibbard@gmail.com> | 2020-04-20 11:30:38 -0400 |
| commit | ff5c04e3142cebfb51873e2c6164703d3b7f74cc (patch) | |
| tree | da9825b15419755e67c2eda5b6f929fc5b6b56d5 /haddock-api/src/Haddock/Backends | |
| parent | b6bebdce0f217af8b6a249b3b6c2bd32dfa2b0b0 (diff) | |
| parent | 75ea1b31fce54bf2b0c1bf8edad4419f48e6036c (diff) | |
Merge remote-tracking branch 'origin/ghc-head' into wip/ttg-con-pat
Diffstat (limited to 'haddock-api/src/Haddock/Backends')
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs | 7 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs index 82d15d62..ddf70b5f 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs @@ -11,10 +11,11 @@ import qualified Data.ByteString as BS import GHC.Types.Basic ( IntegralLit(..) ) import GHC.Driver.Session -import ErrUtils ( emptyMessages, pprLocErrMsg ) +import ErrUtils ( pprLocErrMsg ) import FastString ( mkFastString ) -import Lexer ( P(..), ParseResult(..), PState(..), Token(..) - , mkPStatePure, lexer, mkParserFlags', getErrorMessages, addFatalError ) +import GHC.Parser.Lexer as Lexer + ( P(..), ParseResult(..), PState(..), Token(..) + , mkPStatePure, lexer, mkParserFlags', getErrorMessages) import Bag ( bagToList ) import Outputable ( showSDoc, panic, text, ($$) ) import GHC.Types.SrcLoc diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs index c22afeed..153caf86 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs @@ -40,7 +40,6 @@ import GHC.Exts import GHC.Types.Name import BooleanFormula import GHC.Types.Name.Reader ( rdrNameOcc ) -import Outputable ( panic ) -- | Pretty print a declaration ppDecl :: Bool -- ^ print summary info only |