summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/GHC.hs1
-rw-r--r--compiler/GHC/Driver/Backpack.hs1
-rw-r--r--compiler/GHC/Driver/CodeOutput.hs1
-rw-r--r--compiler/GHC/Driver/Main.hs1
-rw-r--r--compiler/GHC/Driver/Make.hs1
-rw-r--r--compiler/GHC/Driver/Pipeline.hs1
-rw-r--r--compiler/GHC/Driver/Ppr.hs2
-rw-r--r--compiler/GHC/Driver/Session.hs-boot12
-rw-r--r--compiler/GHC/Iface/Errors.hs1
-rw-r--r--compiler/GHC/Iface/Rename.hs1
-rw-r--r--compiler/GHC/Linker/ExtraObj.hs1
-rw-r--r--compiler/GHC/Rename/Names.hs1
-rw-r--r--compiler/GHC/Tc/Utils/Backpack.hs1
-rw-r--r--compiler/GHC/Types/Name/Ppr.hs1
-rw-r--r--compiler/GHC/Unit.hs3
-rw-r--r--compiler/GHC/Unit/Finder/Types.hs1
-rw-r--r--compiler/GHC/Unit/State.hs-boot12
-rw-r--r--ghc/GHCi/UI.hs1
18 files changed, 2 insertions, 41 deletions
diff --git a/compiler/GHC.hs b/compiler/GHC.hs
index 20f0ec633a..4fa2b60c82 100644
--- a/compiler/GHC.hs
+++ b/compiler/GHC.hs
@@ -392,7 +392,6 @@ import GHC.Types.TypeEnv
import GHC.Unit
import GHC.Unit.Env
import GHC.Unit.External
-import GHC.Unit.State
import GHC.Unit.Finder
import GHC.Unit.Module.ModIface
import GHC.Unit.Module.ModGuts
diff --git a/compiler/GHC/Driver/Backpack.hs b/compiler/GHC/Driver/Backpack.hs
index ca34af8d0f..9c32bb3fb6 100644
--- a/compiler/GHC/Driver/Backpack.hs
+++ b/compiler/GHC/Driver/Backpack.hs
@@ -59,7 +59,6 @@ import GHC.Utils.Logger
import GHC.Unit
import GHC.Unit.Env
import GHC.Unit.External
-import GHC.Unit.State
import GHC.Unit.Finder
import GHC.Unit.Module.Graph
import GHC.Unit.Module.ModSummary
diff --git a/compiler/GHC/Driver/CodeOutput.hs b/compiler/GHC/Driver/CodeOutput.hs
index e0b8879fd9..291cae88d5 100644
--- a/compiler/GHC/Driver/CodeOutput.hs
+++ b/compiler/GHC/Driver/CodeOutput.hs
@@ -46,7 +46,6 @@ import GHC.Utils.Exception (bracket)
import GHC.Utils.Ppr (Mode(..))
import GHC.Unit
-import GHC.Unit.State
import GHC.Unit.Finder ( mkStubPaths )
import GHC.Types.SrcLoc
diff --git a/compiler/GHC/Driver/Main.hs b/compiler/GHC/Driver/Main.hs
index 9a55807c0d..f68927ccb5 100644
--- a/compiler/GHC/Driver/Main.hs
+++ b/compiler/GHC/Driver/Main.hs
@@ -177,7 +177,6 @@ import GHC.Unit
import GHC.Unit.Env
import GHC.Unit.Finder
import GHC.Unit.External
-import GHC.Unit.State
import GHC.Unit.Module.ModDetails
import GHC.Unit.Module.ModGuts
import GHC.Unit.Module.ModIface
diff --git a/compiler/GHC/Driver/Make.hs b/compiler/GHC/Driver/Make.hs
index 9a14fc449d..185a2189d7 100644
--- a/compiler/GHC/Driver/Make.hs
+++ b/compiler/GHC/Driver/Make.hs
@@ -102,7 +102,6 @@ import GHC.Types.Name.Env
import GHC.Unit
import GHC.Unit.External
-import GHC.Unit.State
import GHC.Unit.Finder
import GHC.Unit.Module.ModSummary
import GHC.Unit.Module.ModIface
diff --git a/compiler/GHC/Driver/Pipeline.hs b/compiler/GHC/Driver/Pipeline.hs
index 59b5b5ea56..a23cb76cbc 100644
--- a/compiler/GHC/Driver/Pipeline.hs
+++ b/compiler/GHC/Driver/Pipeline.hs
@@ -100,7 +100,6 @@ import GHC.Types.SourceError
import GHC.Unit
import GHC.Unit.Env
-import GHC.Unit.State
import GHC.Unit.Finder
import GHC.Unit.Module.ModSummary
import GHC.Unit.Module.ModIface
diff --git a/compiler/GHC/Driver/Ppr.hs b/compiler/GHC/Driver/Ppr.hs
index 49188d08f0..a61d1cae29 100644
--- a/compiler/GHC/Driver/Ppr.hs
+++ b/compiler/GHC/Driver/Ppr.hs
@@ -12,7 +12,7 @@ where
import GHC.Prelude
import GHC.Driver.Session
-import {-# SOURCE #-} GHC.Unit.State
+import GHC.Unit.State
import GHC.Utils.Outputable
import GHC.Utils.Ppr ( Mode(..) )
diff --git a/compiler/GHC/Driver/Session.hs-boot b/compiler/GHC/Driver/Session.hs-boot
deleted file mode 100644
index d2125e4b9d..0000000000
--- a/compiler/GHC/Driver/Session.hs-boot
+++ /dev/null
@@ -1,12 +0,0 @@
-module GHC.Driver.Session where
-
-import GHC.Prelude
-import GHC.Platform
-import {-# SOURCE #-} GHC.Utils.Outputable
-
-data DynFlags
-
-targetPlatform :: DynFlags -> Platform
-hasPprDebug :: DynFlags -> Bool
-hasNoDebugOutput :: DynFlags -> Bool
-initSDocContext :: DynFlags -> PprStyle -> SDocContext
diff --git a/compiler/GHC/Iface/Errors.hs b/compiler/GHC/Iface/Errors.hs
index 83f9b03920..29c88731f4 100644
--- a/compiler/GHC/Iface/Errors.hs
+++ b/compiler/GHC/Iface/Errors.hs
@@ -24,7 +24,6 @@ import GHC.Prelude
import GHC.Unit
import GHC.Unit.Env
import GHC.Unit.Finder.Types
-import GHC.Unit.State
import GHC.Utils.Outputable as Outputable
diff --git a/compiler/GHC/Iface/Rename.hs b/compiler/GHC/Iface/Rename.hs
index 7f51a8f933..ce49c7c976 100644
--- a/compiler/GHC/Iface/Rename.hs
+++ b/compiler/GHC/Iface/Rename.hs
@@ -25,7 +25,6 @@ import GHC.Iface.Env
import {-# SOURCE #-} GHC.Iface.Load -- a bit vexing
import GHC.Unit
-import GHC.Unit.State
import GHC.Unit.Module.ModIface
import GHC.Unit.Module.Deps
diff --git a/compiler/GHC/Linker/ExtraObj.hs b/compiler/GHC/Linker/ExtraObj.hs
index 81fa062805..1bc4f4234b 100644
--- a/compiler/GHC/Linker/ExtraObj.hs
+++ b/compiler/GHC/Linker/ExtraObj.hs
@@ -25,7 +25,6 @@ import GHC.Platform
import GHC.Unit
import GHC.Unit.Env
-import GHC.Unit.State
import GHC.Utils.Asm
import GHC.Utils.Error
diff --git a/compiler/GHC/Rename/Names.hs b/compiler/GHC/Rename/Names.hs
index b205fc4580..a79048272b 100644
--- a/compiler/GHC/Rename/Names.hs
+++ b/compiler/GHC/Rename/Names.hs
@@ -95,7 +95,6 @@ import qualified Data.Set as S
import System.FilePath ((</>))
import System.IO
-import GHC.Unit.State
{-
************************************************************************
diff --git a/compiler/GHC/Tc/Utils/Backpack.hs b/compiler/GHC/Tc/Utils/Backpack.hs
index 9c1d3a3991..ffaa882cf6 100644
--- a/compiler/GHC/Tc/Utils/Backpack.hs
+++ b/compiler/GHC/Tc/Utils/Backpack.hs
@@ -40,7 +40,6 @@ import GHC.Types.Unique.DSet
import GHC.Types.Name.Shape
import GHC.Unit
-import GHC.Unit.State
import GHC.Unit.Finder
import GHC.Unit.Module.Warnings
import GHC.Unit.Module.ModIface
diff --git a/compiler/GHC/Types/Name/Ppr.hs b/compiler/GHC/Types/Name/Ppr.hs
index bced8034ae..d357d9e5bf 100644
--- a/compiler/GHC/Types/Name/Ppr.hs
+++ b/compiler/GHC/Types/Name/Ppr.hs
@@ -12,7 +12,6 @@ import GHC.Prelude
import GHC.Unit
import GHC.Unit.Env
-import GHC.Unit.State
import GHC.Core.TyCon
diff --git a/compiler/GHC/Unit.hs b/compiler/GHC/Unit.hs
index 593e94fa38..2c33314429 100644
--- a/compiler/GHC/Unit.hs
+++ b/compiler/GHC/Unit.hs
@@ -17,8 +17,7 @@ import GHC.Unit.Info
import GHC.Unit.Parser
import GHC.Unit.Module
import GHC.Unit.Home
--- source import to avoid DynFlags import loops
-import {-# SOURCE #-} GHC.Unit.State
+import GHC.Unit.State
{-
diff --git a/compiler/GHC/Unit/Finder/Types.hs b/compiler/GHC/Unit/Finder/Types.hs
index c48b7d9789..d589cacbba 100644
--- a/compiler/GHC/Unit/Finder/Types.hs
+++ b/compiler/GHC/Unit/Finder/Types.hs
@@ -8,7 +8,6 @@ where
import GHC.Prelude
import GHC.Unit
-import GHC.Unit.State
import qualified Data.Map as M
import GHC.Fingerprint
diff --git a/compiler/GHC/Unit/State.hs-boot b/compiler/GHC/Unit/State.hs-boot
deleted file mode 100644
index 3d06269654..0000000000
--- a/compiler/GHC/Unit/State.hs-boot
+++ /dev/null
@@ -1,12 +0,0 @@
-module GHC.Unit.State where
-
-import {-# SOURCE #-} GHC.Utils.Outputable
-import {-# SOURCE #-} GHC.Unit.Types (UnitId,Unit)
-
-data UnitState
-data UnitDatabase unit
-
-emptyUnitState :: UnitState
-pprUnitIdForUser :: UnitState -> UnitId -> SDoc
-pprWithUnitState :: UnitState -> SDoc -> SDoc
-unwireUnit :: UnitState -> Unit-> Unit
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index 001caf1fff..afacb845de 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -78,7 +78,6 @@ import qualified GHC.Parser.Lexer as Lexer
import GHC.Parser.Header ( toArgs )
import GHC.Unit
-import GHC.Unit.State
import GHC.Unit.Finder as Finder
import GHC.Unit.Module.Graph (filterToposortToModules)
import GHC.Unit.Module.ModSummary
View Lorry Controller Status