diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-03-23 16:40:54 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-03-23 16:40:54 -0400 |
| commit | 65f22afa9e66195baa6b7d44369e2b23cd8f77d2 (patch) | |
| tree | b2c45229d7111f3f3aa4e4af0619120686b3b912 /haddock-api/src/Haddock/Backends | |
| parent | 7618613814d5aca838d70df0c1b20ec99f5611a8 (diff) | |
| parent | 3c2944c037263b426c4fe60a3424c27b852ea71c (diff) | |
Merge commit '3c2944c037263b426c4fe60a3424c27b852ea71c' into HEAD
More changes from the GHC types module refactoring.
Diffstat (limited to 'haddock-api/src/Haddock/Backends')
| -rw-r--r-- | haddock-api/src/Haddock/Backends/LaTeX.hs | 6 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml/Names.hs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs index a3f4c4e9..98b13756 100644 --- a/haddock-api/src/Haddock/Backends/LaTeX.hs +++ b/haddock-api/src/Haddock/Backends/LaTeX.hs @@ -26,9 +26,9 @@ import qualified Pretty import GHC.Types.Basic ( PromotionFlag(..) ) import GHC -import GHC.Types.Name.OccName -import GHC.Types.Name ( nameOccName ) -import GHC.Types.Name.RdrName ( rdrNameOcc ) +import GHC.Types.Name.Occurrence +import GHC.Types.Name ( nameOccName ) +import GHC.Types.Name.Reader ( rdrNameOcc ) import FastString ( unpackFS ) import Outputable ( panic) diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs index 265a675f..97db7b86 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs @@ -39,7 +39,7 @@ import GHC hiding (LexicalFixity(..)) import GHC.Exts import GHC.Types.Name import BooleanFormula -import GHC.Types.Name.RdrName ( rdrNameOcc ) +import GHC.Types.Name.Reader ( rdrNameOcc ) import Outputable ( panic ) -- | Pretty print a declaration diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Names.hs b/haddock-api/src/Haddock/Backends/Xhtml/Names.hs index 193d5afc..6c5fecee 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml/Names.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml/Names.hs @@ -28,7 +28,7 @@ import qualified Data.List as List import GHC hiding (LexicalFixity(..)) import GHC.Types.Name -import GHC.Types.Name.RdrName +import GHC.Types.Name.Reader import FastString (unpackFS) |