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

Clean-up of Interface and Interface.Create's imports and pragmata

Author: Kleidukos

haddock-api/src/Haddock/Interface.hs

@@ -35,10 +35,10 @@ module Haddock.Interface (
 
 
 import Haddock.GhcUtils
-import Haddock.InterfaceFile
-import Haddock.Interface.Create
 import Haddock.Interface.AttachInstances
+import Haddock.Interface.Create
 import Haddock.Interface.Rename
+import Haddock.InterfaceFile
 import Haddock.Options hiding (verbosity)
 import Haddock.Types
 import Haddock.Utils
@@ -51,24 +51,24 @@ import qualified Data.Map as Map
 import qualified Data.Set as Set
 import Text.Printf
 
-import GHC hiding (verbosity)
+import GHC                       hiding (verbosity)
+import GHC.Data.FastString       (unpackFS)
 import GHC.Data.Graph.Directed
-import GHC.Driver.Session hiding (verbosity)
-import GHC.Driver.Types (isBootSummary)
-import GHC.Driver.Monad (modifySession)
-import GHC.Data.FastString (unpackFS)
-import GHC.Tc.Types (TcM, TcGblEnv(..))
-import GHC.Tc.Utils.Monad (setGblEnv)
-import GHC.Tc.Utils.Env (tcLookupGlobal)
-import GHC.Types.Name (nameIsFromExternalPackage, nameOccName)
-import GHC.Types.Name.Occurrence (isTcOcc)
-import GHC.Types.Name.Reader (unQualOK, gre_name, globalRdrEnvElts)
-import GHC.Unit.Module.Env (mkModuleSet, emptyModuleSet, unionModuleSet, ModuleSet)
-import GHC.Unit.Types (IsBootInterface(..))
-import GHC.Utils.Error (withTimingD)
+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, StaticPlugin(..), Plugin(..), PluginWithArgs(..),
-                     defaultPlugin, keepRenamedSource)
+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)
 
 #if defined(mingw32_HOST_OS)
 import System.IO

haddock-api/src/Haddock/Interface/Create.hs

@@ -1,8 +1,16 @@
-{-# LANGUAGE StandaloneDeriving, FlexibleInstances, MultiParamTypeClasses, CPP, TupleSections, BangPatterns, LambdaCase, NamedFieldPuns, ScopedTypeVariables #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TupleSections #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -Wwarn #-}
 -----------------------------------------------------------------------------
 -- |
@@ -41,36 +49,26 @@ import Data.Maybe
 import Data.Traversable
 import GHC.Stack (HasCallStack)
 
-import GHC.Tc.Utils.Monad (finalSafeMode)
-import GHC.Types.Avail hiding (avail)
-import qualified GHC.Types.Avail  as Avail
-import qualified GHC.Unit.Module as Module
--- <<<<<<< HEAD
-import qualified GHC.Types.SrcLoc as SrcLoc
-import GHC.Core.Class ( ClassMinimalDef, classMinimalDef )
-import GHC.Core.ConLike (ConLike(..))
-import GHC hiding ( lookupName )
+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.Unit.Module.ModSummary
--- import qualified GHC.Types.SrcLoc as SrcLoc
--- import GHC.Types.SourceFile
--- import GHC.Core.Class
--- import GHC.Core.ConLike (ConLike(..))
--- import GHC hiding (lookupName)
--- import GHC.Driver.Ppr
--- >>>>>>> 703e5f02... Abstract Monad for interface creation
+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.Types.Name
-import GHC.Types.Name.Set
 import GHC.Types.Name.Env
-import GHC.Unit.State
 import GHC.Types.Name.Reader
-import GHC.Tc.Types hiding (IfM)
-import GHC.Data.FastString ( unpackFS, bytesFS )
-import GHC.Types.Basic ( StringLiteral(..), SourceText(..), PromotionFlag(..) )
-import qualified GHC.Utils.Outputable as O
-import GHC.HsToCore.Docs hiding (mkMaps)
-import GHC.Parser.Annotation (IsUnicodeSyntax(..))
+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
 
 
 mkExceptionContext :: ModSummary -> String