From 2d2587182568cc5aa4b29d401517337c32459c66 Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Tue, 21 Apr 2020 13:00:42 +0200 Subject: Module structure --- haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs | 10 +++++----- haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs | 2 +- haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'haddock-api/src/Haddock/Backends/Hyperlinker') diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs index ddf70b5f..41591c6e 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs @@ -11,15 +11,15 @@ import qualified Data.ByteString as BS import GHC.Types.Basic ( IntegralLit(..) ) import GHC.Driver.Session -import ErrUtils ( pprLocErrMsg ) -import FastString ( mkFastString ) +import GHC.Utils.Error ( pprLocErrMsg ) +import GHC.Data.FastString ( mkFastString ) import GHC.Parser.Lexer as Lexer ( P(..), ParseResult(..), PState(..), Token(..) , mkPStatePure, lexer, mkParserFlags', getErrorMessages) -import Bag ( bagToList ) -import Outputable ( showSDoc, panic, text, ($$) ) +import GHC.Data.Bag ( bagToList ) +import GHC.Utils.Outputable ( showSDoc, panic, text, ($$) ) import GHC.Types.SrcLoc -import StringBuffer ( StringBuffer, atEnd ) +import GHC.Data.StringBuffer ( StringBuffer, atEnd ) import Haddock.Backends.Hyperlinker.Types as T import Haddock.GhcUtils diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs index a83c935c..a6134cd2 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs @@ -17,7 +17,7 @@ import GHC.Types.Module ( ModuleName, moduleNameString ) import GHC.Types.Name ( getOccString, isInternalName, Name, nameModule, nameUnique ) import GHC.Types.SrcLoc import GHC.Types.Unique ( getKey ) -import Encoding ( utf8DecodeByteString ) +import GHC.Utils.Encoding ( utf8DecodeByteString ) import System.FilePath.Posix (()) diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs index b3ccf1be..17ba00f0 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs @@ -21,7 +21,7 @@ import GHC import GHC.Iface.Ext.Types ( HieAST(..), HieType(..), HieArgs(..), TypeIndex, HieTypeFlat ) import GHC.Iface.Type import GHC.Types.Name ( getOccFS, getOccString ) -import Outputable ( showSDoc ) +import GHC.Utils.Outputable( showSDoc ) import GHC.Types.Var ( VarBndr(..) ) import System.FilePath.Posix ((), (<.>)) -- cgit v1.2.3