From bfccd832782353a000b430870a6602cc591c8b7a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 21 May 2019 23:00:27 -0400 Subject: 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. --- ghc/GHCi/Leak.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ghc') 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 -- cgit v1.2.1