Skip to content
This repository was archived by the owner on Aug 3, 2024. It is now read-only.

Commit e401749

Browse files
KleidukosKleidukos
committed
Fix Interface and Interface.Create imports
1 parent bce435a commit e401749

File tree

2 files changed

+45
-47
lines changed

2 files changed

+45
-47
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ module Haddock.Interface (
3535

3636

3737
import Haddock.GhcUtils
38-
import Haddock.InterfaceFile
39-
import Haddock.Interface.Create
4038
import Haddock.Interface.AttachInstances
39+
import Haddock.Interface.Create
4140
import Haddock.Interface.Rename
41+
import Haddock.InterfaceFile
4242
import Haddock.Options hiding (verbosity)
4343
import Haddock.Types
4444
import Haddock.Utils
@@ -51,24 +51,24 @@ import qualified Data.Map as Map
5151
import qualified Data.Set as Set
5252
import Text.Printf
5353

54-
import GHC hiding (verbosity)
54+
import GHC hiding (verbosity)
55+
import GHC.Data.FastString (unpackFS)
5556
import GHC.Data.Graph.Directed
56-
import GHC.Driver.Session hiding (verbosity)
57-
import GHC.Driver.Types (isBootSummary)
58-
import GHC.Driver.Monad (modifySession)
59-
import GHC.Data.FastString (unpackFS)
60-
import GHC.Tc.Types (TcM, TcGblEnv(..))
61-
import GHC.Tc.Utils.Monad (setGblEnv)
62-
import GHC.Tc.Utils.Env (tcLookupGlobal)
63-
import GHC.Types.Name (nameIsFromExternalPackage, nameOccName)
64-
import GHC.Types.Name.Occurrence (isTcOcc)
65-
import GHC.Types.Name.Reader (unQualOK, gre_name, globalRdrEnvElts)
66-
import GHC.Unit.Module.Env (mkModuleSet, emptyModuleSet, unionModuleSet, ModuleSet)
67-
import GHC.Unit.Types (IsBootInterface(..))
68-
import GHC.Utils.Error (withTimingD)
57+
import GHC.Driver.Monad (modifySession)
58+
import GHC.Driver.Session hiding (verbosity)
59+
import GHC.Driver.Types (isBootSummary)
6960
import GHC.HsToCore.Docs
70-
import GHC.Plugins (HscEnv(..), Outputable, StaticPlugin(..), Plugin(..), PluginWithArgs(..),
71-
defaultPlugin, keepRenamedSource)
61+
import GHC.Plugins (HscEnv (..), Outputable, Plugin (..), PluginWithArgs (..), StaticPlugin (..),
62+
defaultPlugin, keepRenamedSource)
63+
import GHC.Tc.Types (TcGblEnv (..), TcM)
64+
import GHC.Tc.Utils.Env (tcLookupGlobal)
65+
import GHC.Tc.Utils.Monad (setGblEnv)
66+
import GHC.Types.Name (nameIsFromExternalPackage, nameOccName)
67+
import GHC.Types.Name.Occurrence (isTcOcc)
68+
import GHC.Types.Name.Reader (globalRdrEnvElts, gre_name, unQualOK)
69+
import GHC.Unit.Module.Env (ModuleSet, emptyModuleSet, mkModuleSet, unionModuleSet)
70+
import GHC.Unit.Types (IsBootInterface (..))
71+
import GHC.Utils.Error (withTimingD)
7272

7373
#if defined(mingw32_HOST_OS)
7474
import System.IO

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

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
{-# LANGUAGE StandaloneDeriving, FlexibleInstances, MultiParamTypeClasses, CPP, TupleSections, BangPatterns, LambdaCase, NamedFieldPuns, ScopedTypeVariables #-}
2-
{-# LANGUAGE TypeFamilies #-}
3-
{-# LANGUAGE ViewPatterns #-}
1+
{-# LANGUAGE BangPatterns #-}
2+
{-# LANGUAGE CPP #-}
43
{-# LANGUAGE DerivingStrategies #-}
4+
{-# LANGUAGE FlexibleInstances #-}
55
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
6+
{-# LANGUAGE LambdaCase #-}
7+
{-# LANGUAGE MultiParamTypeClasses #-}
8+
{-# LANGUAGE NamedFieldPuns #-}
9+
{-# LANGUAGE ScopedTypeVariables #-}
10+
{-# LANGUAGE StandaloneDeriving #-}
11+
{-# LANGUAGE TupleSections #-}
12+
{-# LANGUAGE TypeFamilies #-}
13+
{-# LANGUAGE ViewPatterns #-}
614
{-# OPTIONS_GHC -Wwarn #-}
715
-----------------------------------------------------------------------------
816
-- |
@@ -41,36 +49,26 @@ import Data.Maybe
4149
import Data.Traversable
4250
import GHC.Stack (HasCallStack)
4351

44-
import GHC.Tc.Utils.Monad (finalSafeMode)
45-
import GHC.Types.Avail hiding (avail)
46-
import qualified GHC.Types.Avail as Avail
47-
import qualified GHC.Unit.Module as Module
48-
-- <<<<<<< HEAD
49-
import qualified GHC.Types.SrcLoc as SrcLoc
50-
import GHC.Core.Class ( ClassMinimalDef, classMinimalDef )
51-
import GHC.Core.ConLike (ConLike(..))
52-
import GHC hiding ( lookupName )
52+
import GHC hiding (lookupName)
53+
import GHC.Core.Class (ClassMinimalDef, classMinimalDef)
54+
import GHC.Core.ConLike (ConLike (..))
55+
import GHC.Data.FastString (bytesFS, unpackFS)
5356
import GHC.Driver.Types
54-
-- =======
55-
-- import GHC.Unit.Module.ModSummary
56-
-- import qualified GHC.Types.SrcLoc as SrcLoc
57-
-- import GHC.Types.SourceFile
58-
-- import GHC.Core.Class
59-
-- import GHC.Core.ConLike (ConLike(..))
60-
-- import GHC hiding (lookupName)
61-
-- import GHC.Driver.Ppr
62-
-- >>>>>>> 703e5f02... Abstract Monad for interface creation
57+
import GHC.HsToCore.Docs hiding (mkMaps)
58+
import GHC.Parser.Annotation (IsUnicodeSyntax (..))
59+
import GHC.Tc.Types hiding (IfM)
60+
import GHC.Tc.Utils.Monad (finalSafeMode)
61+
import GHC.Types.Avail hiding (avail)
62+
import qualified GHC.Types.Avail as Avail
63+
import GHC.Types.Basic (PromotionFlag (..), SourceText (..), StringLiteral (..))
6364
import GHC.Types.Name
64-
import GHC.Types.Name.Set
6565
import GHC.Types.Name.Env
66-
import GHC.Unit.State
6766
import GHC.Types.Name.Reader
68-
import GHC.Tc.Types hiding (IfM)
69-
import GHC.Data.FastString ( unpackFS, bytesFS )
70-
import GHC.Types.Basic ( StringLiteral(..), SourceText(..), PromotionFlag(..) )
71-
import qualified GHC.Utils.Outputable as O
72-
import GHC.HsToCore.Docs hiding (mkMaps)
73-
import GHC.Parser.Annotation (IsUnicodeSyntax(..))
67+
import GHC.Types.Name.Set
68+
import qualified GHC.Types.SrcLoc as SrcLoc
69+
import qualified GHC.Unit.Module as Module
70+
import GHC.Unit.State
71+
import qualified GHC.Utils.Outputable as O
7472

7573

7674
mkExceptionContext :: ModSummary -> String

0 commit comments

Comments
 (0)