diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2020-11-30 11:15:13 +0100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-12-11 22:42:48 -0500 |
commit | 76be0e32d6638c04521b74421a9ce2380593fb54 (patch) | |
tree | 4ed92438a09861d6d23692611f4985de51fc4264 | |
parent | 690c894616a539c59cb8e58d2bba8b9c02c5ad4c (diff) | |
download | haskell-76be0e32d6638c04521b74421a9ce2380593fb54.tar.gz |
Move SizedSeq into ghc-boot
-rw-r--r-- | compiler/GHC/ByteCode/Asm.hs | 5 | ||||
-rw-r--r-- | compiler/GHC/ByteCode/Linker.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/ByteCode/Types.hs | 2 | ||||
-rw-r--r-- | libraries/ghc-boot/GHC/Data/SizedSeq.hs (renamed from libraries/ghci/SizedSeq.hs) | 2 | ||||
-rw-r--r-- | libraries/ghc-boot/ghc-boot.cabal.in | 1 | ||||
-rw-r--r-- | libraries/ghci/GHCi/CreateBCO.hs | 2 | ||||
-rw-r--r-- | libraries/ghci/GHCi/ResolvedBCO.hs | 2 | ||||
-rw-r--r-- | libraries/ghci/ghci.cabal.in | 1 |
8 files changed, 8 insertions, 9 deletions
diff --git a/compiler/GHC/ByteCode/Asm.hs b/compiler/GHC/ByteCode/Asm.hs index ff8bacd6cc..17db8a2691 100644 --- a/compiler/GHC/ByteCode/Asm.hs +++ b/compiler/GHC/ByteCode/Asm.hs @@ -41,12 +41,11 @@ import GHC.Utils.Misc import GHC.Core.TyCon import GHC.Data.FastString +import GHC.Data.SizedSeq + import GHC.StgToCmm.Layout ( ArgRep(..) ) import GHC.Platform --- From iserv -import SizedSeq - import Control.Monad import Control.Monad.ST ( runST ) import Control.Monad.Trans.Class diff --git a/compiler/GHC/ByteCode/Linker.hs b/compiler/GHC/ByteCode/Linker.hs index 7b532b96d5..5c58d319ef 100644 --- a/compiler/GHC/ByteCode/Linker.hs +++ b/compiler/GHC/ByteCode/Linker.hs @@ -26,7 +26,6 @@ import GHC.ByteCode.Types import GHCi.RemoteTypes import GHCi.ResolvedBCO import GHCi.BreakArray -import SizedSeq import GHC.Builtin.PrimOps @@ -34,6 +33,7 @@ import GHC.Unit.Types import GHC.Unit.Module.Name import GHC.Data.FastString +import GHC.Data.SizedSeq import GHC.Utils.Panic import GHC.Utils.Outputable diff --git a/compiler/GHC/ByteCode/Types.hs b/compiler/GHC/ByteCode/Types.hs index 04f654f7eb..97304cb7f4 100644 --- a/compiler/GHC/ByteCode/Types.hs +++ b/compiler/GHC/ByteCode/Types.hs @@ -17,12 +17,12 @@ module GHC.ByteCode.Types import GHC.Prelude import GHC.Data.FastString +import GHC.Data.SizedSeq import GHC.Types.Id import GHC.Types.Name import GHC.Types.Name.Env import GHC.Utils.Outputable import GHC.Builtin.PrimOps -import SizedSeq import GHC.Core.Type import GHC.Types.SrcLoc import GHCi.BreakArray diff --git a/libraries/ghci/SizedSeq.hs b/libraries/ghc-boot/GHC/Data/SizedSeq.hs index f83e14081f..b48791d863 100644 --- a/libraries/ghci/SizedSeq.hs +++ b/libraries/ghc-boot/GHC/Data/SizedSeq.hs @@ -1,5 +1,5 @@ {-# LANGUAGE StandaloneDeriving, DeriveGeneric #-} -module SizedSeq +module GHC.Data.SizedSeq ( SizedSeq(..) , emptySS , addToSS diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index 45f8fcc1d8..2dec48f034 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -39,6 +39,7 @@ Library exposed-modules: GHC.BaseDir GHC.Data.ShortText + GHC.Data.SizedSeq GHC.Utils.Encoding GHC.LanguageExtensions GHC.Unit.Database diff --git a/libraries/ghci/GHCi/CreateBCO.hs b/libraries/ghci/GHCi/CreateBCO.hs index 7098c27fb8..7d969efc8d 100644 --- a/libraries/ghci/GHCi/CreateBCO.hs +++ b/libraries/ghci/GHCi/CreateBCO.hs @@ -17,7 +17,7 @@ import Prelude -- See note [Why do we import Prelude here?] import GHCi.ResolvedBCO import GHCi.RemoteTypes import GHCi.BreakArray -import SizedSeq +import GHC.Data.SizedSeq import System.IO (fixIO) import Control.Monad diff --git a/libraries/ghci/GHCi/ResolvedBCO.hs b/libraries/ghci/GHCi/ResolvedBCO.hs index e780465420..5dda6f6053 100644 --- a/libraries/ghci/GHCi/ResolvedBCO.hs +++ b/libraries/ghci/GHCi/ResolvedBCO.hs @@ -7,7 +7,7 @@ module GHCi.ResolvedBCO ) where import Prelude -- See note [Why do we import Prelude here?] -import SizedSeq +import GHC.Data.SizedSeq import GHCi.RemoteTypes import GHCi.BreakArray diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index 39ba3ccbe7..bfa6b1bbab 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -68,7 +68,6 @@ library GHCi.InfoTable GHCi.StaticPtrTable GHCi.TH.Binary - SizedSeq Build-Depends: array == 0.5.*, |