diff options
author | John Ericson <git@JohnEricson.me> | 2019-05-21 23:00:27 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-05-29 16:06:45 -0400 |
commit | bfccd832782353a000b430870a6602cc591c8b7a (patch) | |
tree | 499d224a8aa6f8adb5dc2b726f7726b6409b8c41 /ghc | |
parent | ace2e3350fa7da1f7ebcdb882f1241da10a90c26 (diff) | |
download | haskell-bfccd832782353a000b430870a6602cc591c8b7a.tar.gz |
Inline `Settings` into `DynFlags`
After the previous commit, `Settings` is just a thin wrapper around
other groups of settings. While `Settings` is used by GHC-the-executable
to initalize `DynFlags`, in principle another consumer of
GHC-the-library could initialize `DynFlags` a different way. It
therefore doesn't make sense for `DynFlags` itself (library code) to
separate the settings that typically come from `Settings` from the
settings that typically don't.
Diffstat (limited to 'ghc')
-rw-r--r-- | ghc/GHCi/Leak.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ghc/GHCi/Leak.hs b/ghc/GHCi/Leak.hs index 874d9e2cdc..3bb9bbceb5 100644 --- a/ghc/GHCi/Leak.hs +++ b/ghc/GHCi/Leak.hs @@ -7,7 +7,6 @@ module GHCi.Leak import Control.Monad import Data.Bits -import DynFlags ( sTargetPlatform ) import Foreign.Ptr (ptrToIntPtr, intPtrToPtr) import GHC import GHC.Ptr (Ptr (..)) @@ -68,7 +67,7 @@ checkLeakIndicators dflags (LeakIndicators leakmods) = do show (maskTagBits addr)) tagBits - | target32Bit (sTargetPlatform (settings dflags)) = 2 + | target32Bit (targetPlatform dflags) = 2 | otherwise = 3 maskTagBits :: Ptr a -> Ptr a |