DynFlags: disentangle Outputable

- put panic related functions into GHC.Utils.Panic
- put trace related functions using DynFlags in GHC.Driver.Ppr

One step closer making Outputable fully independent of DynFlags.

Bump haddock submodule

7 files changed, 12 insertions, 3 deletions

diff --git a/compiler/GHC/Runtime/Debugger.hs b/compiler/GHC/Runtime/Debugger.hs
index 43aacc2085..9daa62d58d 100644
--- a/compiler/GHC/Runtime/Debugger.hs
+++ b/compiler/GHC/Runtime/Debugger.hs
@@ -37,6 +37,7 @@ import GHC.Core.Ppr.TyThing
 import GHC.Utils.Error
 import GHC.Utils.Monad
 import GHC.Driver.Session
+import GHC.Driver.Ppr
 import GHC.Utils.Exception
 
 import Control.Monad
diff --git a/compiler/GHC/Runtime/Eval.hs b/compiler/GHC/Runtime/Eval.hs
index 6871073eea..2ee3143f76 100644
--- a/compiler/GHC/Runtime/Eval.hs
+++ b/compiler/GHC/Runtime/Eval.hs
@@ -80,6 +80,7 @@ import GHC.Types.Var.Env
 import GHC.ByteCode.Types
 import GHC.Runtime.Linker as Linker
 import GHC.Driver.Session
+import GHC.Driver.Ppr
 import GHC.LanguageExtensions
 import GHC.Types.Unique
 import GHC.Types.Unique.Supply
diff --git a/compiler/GHC/Runtime/Heap/Inspect.hs b/compiler/GHC/Runtime/Heap/Inspect.hs
index b7e9a1b104..ea682702c6 100644
--- a/compiler/GHC/Runtime/Heap/Inspect.hs
+++ b/compiler/GHC/Runtime/Heap/Inspect.hs
@@ -57,7 +57,9 @@ import GHC.Types.Basic ( Boxity(..) )
 import GHC.Builtin.Types.Prim
 import GHC.Builtin.Types
 import GHC.Driver.Session
+import GHC.Driver.Ppr
 import GHC.Utils.Outputable as Ppr
+import GHC.Utils.Panic
 import GHC.Char
 import GHC.Exts.Heap
 import GHC.Runtime.Heap.Layout ( roundUpTo )
diff --git a/compiler/GHC/Runtime/Heap/Layout.hs b/compiler/GHC/Runtime/Heap/Layout.hs
index cd09ad0163..7e4d5af136 100644
--- a/compiler/GHC/Runtime/Heap/Layout.hs
+++ b/compiler/GHC/Runtime/Heap/Layout.hs
@@ -48,12 +48,14 @@ import GHC.Prelude
 
 import GHC.Types.Basic( ConTagZ )
 import GHC.Driver.Session
-import GHC.Utils.Outputable
 import GHC.Platform
 import GHC.Platform.Profile
 import GHC.Data.FastString
 import GHC.StgToCmm.Types
 
+import GHC.Utils.Outputable
+import GHC.Utils.Panic
+
 import Data.Word
 import Data.Bits
 import Data.ByteString (ByteString)
diff --git a/compiler/GHC/Runtime/Interpreter.hs b/compiler/GHC/Runtime/Interpreter.hs
index 561b4e2a6a..bcfd34ee15 100644
--- a/compiler/GHC/Runtime/Interpreter.hs
+++ b/compiler/GHC/Runtime/Interpreter.hs
@@ -70,7 +70,8 @@ import GHC.Types.Basic
 import GHC.Data.FastString
 import GHC.Utils.Misc
 import GHC.Runtime.Eval.Types(BreakInfo(..))
-import GHC.Utils.Outputable(brackets, ppr, showSDocUnqual)
+import GHC.Utils.Outputable(brackets, ppr)
+import GHC.Driver.Ppr (showSDoc)
 import GHC.Types.SrcLoc
 import GHC.Data.Maybe
 import GHC.Unit.Module
@@ -413,7 +414,7 @@ handleSeqHValueStatus hsc_env eval_status = do
              | otherwise = Just (BreakInfo modl ix)
           sdocBpLoc = brackets . ppr . getSeqBpSpan
       putStrLn ("*** Ignoring breakpoint " ++
-            (showSDocUnqual (hsc_dflags hsc_env) $ sdocBpLoc bp))
+            (showSDoc (hsc_dflags hsc_env) $ sdocBpLoc bp))
       -- resume the seq (:force) processing in the iserv process
       withForeignRef resume_ctxt_fhv $ \hval ->
         iservCmd hsc_env (ResumeSeq hval) >>= handleSeqHValueStatus hsc_env
diff --git a/compiler/GHC/Runtime/Linker.hs b/compiler/GHC/Runtime/Linker.hs
index face7068d4..8c05c38c6c 100644
--- a/compiler/GHC/Runtime/Linker.hs
+++ b/compiler/GHC/Runtime/Linker.hs
@@ -50,6 +50,7 @@ import GHC.Unit.Module
 import GHC.Data.List.SetOps
 import GHC.Runtime.Linker.Types (DynLinker(..), PersistentLinkerState(..))
 import GHC.Driver.Session
+import GHC.Driver.Ppr
 import GHC.Types.Basic
 import GHC.Utils.Outputable
 import GHC.Utils.Panic
diff --git a/compiler/GHC/Runtime/Loader.hs b/compiler/GHC/Runtime/Loader.hs
index 5d286587ef..728b5ca84d 100644
--- a/compiler/GHC/Runtime/Loader.hs
+++ b/compiler/GHC/Runtime/Loader.hs
@@ -22,6 +22,7 @@ module GHC.Runtime.Loader (
 
 import GHC.Prelude
 import GHC.Driver.Session
+import GHC.Driver.Ppr
 
 import GHC.Runtime.Linker      ( linkModule, getHValue )
 import GHC.Runtime.Interpreter ( wormhole, withInterp )