Merge pull request #1346 from Kleidukos/fix-interface-imports

Clean-up of Interface and Interface.Create's imports part 2
haskell · Feb 22, 2021 · c046d25 · c046d25
2 parents 7b34e60 + 4289b9c
commit c046d25
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/haddock-api/src/Haddock/Interface.hs b/haddock-api/src/Haddock/Interface.hs
@@ -44,31 +44,31 @@ import Haddock.Types
 import Haddock.Utils
 
 import Control.Monad
-import Control.Monad.IO.Class ( MonadIO(liftIO) )
+import Control.Monad.IO.Class (MonadIO(liftIO))
 import Data.IORef
 import Data.List (foldl', isPrefixOf, nub)
+import Text.Printf
 import qualified Data.Map as Map
 import qualified Data.Set as Set
-import Text.Printf
 
-import GHC                       hiding (verbosity)
-import GHC.Data.FastString       (unpackFS)
+import GHC hiding (verbosity)
+import GHC.Data.FastString (unpackFS)
 import GHC.Data.Graph.Directed
-import GHC.Driver.Monad          (modifySession)
-import GHC.Driver.Session        hiding (verbosity)
-import GHC.Driver.Types          (isBootSummary)
+import GHC.Driver.Monad (modifySession)
+import GHC.Driver.Session hiding (verbosity)
+import GHC.Driver.Types (isBootSummary)
 import GHC.HsToCore.Docs
-import GHC.Plugins               (HscEnv (..), Outputable, Plugin (..), PluginWithArgs (..), StaticPlugin (..),
-                                  defaultPlugin, keepRenamedSource)
-import GHC.Tc.Types              (TcGblEnv (..), TcM)
-import GHC.Tc.Utils.Env          (tcLookupGlobal)
-import GHC.Tc.Utils.Monad        (setGblEnv)
-import GHC.Types.Name            (nameIsFromExternalPackage, nameOccName)
+import GHC.Plugins (HscEnv (..), Outputable, Plugin (..), PluginWithArgs (..), StaticPlugin (..), defaultPlugin,
+                    keepRenamedSource)
+import GHC.Tc.Types (TcGblEnv (..), TcM)
+import GHC.Tc.Utils.Env (tcLookupGlobal)
+import GHC.Tc.Utils.Monad (setGblEnv)
+import GHC.Types.Name (nameIsFromExternalPackage, nameOccName)
 import GHC.Types.Name.Occurrence (isTcOcc)
-import GHC.Types.Name.Reader     (globalRdrEnvElts, gre_name, unQualOK)
-import GHC.Unit.Module.Env       (ModuleSet, emptyModuleSet, mkModuleSet, unionModuleSet)
-import GHC.Unit.Types            (IsBootInterface (..))
-import GHC.Utils.Error           (withTimingD)
+import GHC.Types.Name.Reader (globalRdrEnvElts, gre_name, unQualOK)
+import GHC.Unit.Module.Env (ModuleSet, emptyModuleSet, mkModuleSet, unionModuleSet)
+import GHC.Unit.Types (IsBootInterface (..))
+import GHC.Utils.Error (withTimingD)
 
 #if defined(mingw32_HOST_OS)
 import System.IO

diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs
@@ -31,44 +31,44 @@
 module Haddock.Interface.Create (IfM, runIfM, createInterface1) where
 
 import Documentation.Haddock.Doc (metaDocAppend)
-import Haddock.Types hiding (liftErrMsg)
-import Haddock.Options
-import Haddock.GhcUtils
-import Haddock.Utils
 import Haddock.Convert
+import Haddock.GhcUtils
 import Haddock.Interface.LexParseRn
+import Haddock.Options
+import Haddock.Types hiding (liftErrMsg)
+import Haddock.Utils
 
 import Control.Monad.Catch
 import Control.Monad.Reader
 import Control.Monad.Writer.Strict hiding (tell)
 import Data.Bitraversable
-import qualified Data.Map as M
-import Data.Map (Map)
 import Data.List (find, foldl')
+import Data.Map (Map)
 import Data.Maybe
 import Data.Traversable
 import GHC.Stack (HasCallStack)
+import qualified Data.Map as M
 
-import GHC                   hiding (lookupName)
-import GHC.Core.Class        (ClassMinimalDef, classMinimalDef)
-import GHC.Core.ConLike      (ConLike (..))
-import GHC.Data.FastString   (bytesFS, unpackFS)
+import GHC hiding (lookupName)
+import GHC.Core.Class (ClassMinimalDef, classMinimalDef)
+import GHC.Core.ConLike (ConLike (..))
+import GHC.Data.FastString (bytesFS, unpackFS)
 import GHC.Driver.Types
-import GHC.HsToCore.Docs     hiding (mkMaps)
+import GHC.HsToCore.Docs hiding (mkMaps)
 import GHC.Parser.Annotation (IsUnicodeSyntax (..))
-import GHC.Tc.Types          hiding (IfM)
-import GHC.Tc.Utils.Monad    (finalSafeMode)
-import GHC.Types.Avail       hiding (avail)
-import qualified GHC.Types.Avail       as Avail
-import GHC.Types.Basic       (PromotionFlag (..), SourceText (..), StringLiteral (..))
+import GHC.Tc.Types hiding (IfM)
+import GHC.Tc.Utils.Monad (finalSafeMode)
+import GHC.Types.Avail hiding (avail)
+import GHC.Types.Basic (PromotionFlag (..), SourceText (..), StringLiteral (..))
 import GHC.Types.Name
 import GHC.Types.Name.Env
 import GHC.Types.Name.Reader
 import GHC.Types.Name.Set
-import qualified GHC.Types.SrcLoc      as SrcLoc
-import qualified GHC.Unit.Module       as Module
 import GHC.Unit.State
-import qualified GHC.Utils.Outputable  as O
+import qualified GHC.Types.Avail as Avail
+import qualified GHC.Types.SrcLoc as SrcLoc
+import qualified GHC.Unit.Module as Module
+import qualified GHC.Utils.Outputable as O
 
 
 mkExceptionContext :: ModSummary -> String