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

19 files changed, 24 insertions, 0 deletions

diff --git a/compiler/GHC/HsToCore/Arrows.hs b/compiler/GHC/HsToCore/Arrows.hs
index 4f9871d412..6668e9a11b 100644
--- a/compiler/GHC/HsToCore/Arrows.hs
+++ b/compiler/GHC/HsToCore/Arrows.hs
@@ -52,6 +52,7 @@ import GHC.Builtin.Types
 import GHC.Types.Basic
 import GHC.Builtin.Names
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Types.Var.Set
 import GHC.Types.SrcLoc
 import GHC.Data.List.SetOps( assocMaybe )
diff --git a/compiler/GHC/HsToCore/Binds.hs b/compiler/GHC/HsToCore/Binds.hs
index 03164c5b25..2a61406792 100644
--- a/compiler/GHC/HsToCore/Binds.hs
+++ b/compiler/GHC/HsToCore/Binds.hs
@@ -63,6 +63,7 @@ import GHC.Core.Rules
 import GHC.Types.Var.Env
 import GHC.Types.Var( EvVar )
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Unit.Module
 import GHC.Types.SrcLoc
 import GHC.Data.Maybe
@@ -70,6 +71,7 @@ import GHC.Data.OrdList
 import GHC.Data.Bag
 import GHC.Types.Basic
 import GHC.Driver.Session
+import GHC.Driver.Ppr
 import GHC.Data.FastString
 import GHC.Utils.Misc
 import GHC.Types.Unique.Set( nonDetEltsUniqSet )
diff --git a/compiler/GHC/HsToCore/Coverage.hs b/compiler/GHC/HsToCore/Coverage.hs
index fefbf2b707..35cf0d4b96 100644
--- a/compiler/GHC/HsToCore/Coverage.hs
+++ b/compiler/GHC/HsToCore/Coverage.hs
@@ -23,8 +23,10 @@ import GHC.Core.Type
 import GHC.Hs
 import GHC.Unit
 import GHC.Utils.Outputable as Outputable
+import GHC.Utils.Panic
 import GHC.Driver.Session
 import GHC.Driver.Backend
+import GHC.Driver.Ppr
 import GHC.Core.ConLike
 import Control.Monad
 import GHC.Types.SrcLoc
diff --git a/compiler/GHC/HsToCore/Expr.hs b/compiler/GHC/HsToCore/Expr.hs
index ffa4e9323f..be6c207dd6 100644
--- a/compiler/GHC/HsToCore/Expr.hs
+++ b/compiler/GHC/HsToCore/Expr.hs
@@ -66,6 +66,7 @@ import GHC.Types.SrcLoc
 import GHC.Utils.Misc
 import GHC.Data.Bag
 import GHC.Utils.Outputable as Outputable
+import GHC.Utils.Panic
 import GHC.Core.PatSyn
 
 import Control.Monad
diff --git a/compiler/GHC/HsToCore/Foreign/Call.hs b/compiler/GHC/HsToCore/Foreign/Call.hs
index 102f2b3697..317c0b9477 100644
--- a/compiler/GHC/HsToCore/Foreign/Call.hs
+++ b/compiler/GHC/HsToCore/Foreign/Call.hs
@@ -50,6 +50,7 @@ import GHC.Builtin.Names
 import GHC.Driver.Session
 import GHC.Utils.Outputable
 import GHC.Utils.Misc
+import GHC.Utils.Panic
 
 import Data.Maybe
 
diff --git a/compiler/GHC/HsToCore/Foreign/Decl.hs b/compiler/GHC/HsToCore/Foreign/Decl.hs
index 71d9eff7f2..2790137912 100644
--- a/compiler/GHC/HsToCore/Foreign/Decl.hs
+++ b/compiler/GHC/HsToCore/Foreign/Decl.hs
@@ -43,6 +43,7 @@ import GHC.Tc.Utils.TcType
 import GHC.Cmm.Expr
 import GHC.Cmm.Utils
 import GHC.Driver.Types
+import GHC.Driver.Ppr
 import GHC.Types.ForeignCall
 import GHC.Builtin.Types
 import GHC.Builtin.Types.Prim
@@ -55,6 +56,7 @@ import GHC.Driver.Session
 import GHC.Platform
 import GHC.Data.OrdList
 import GHC.Utils.Misc
+import GHC.Utils.Panic
 import GHC.Driver.Hooks
 import GHC.Utils.Encoding
 
diff --git a/compiler/GHC/HsToCore/GuardedRHSs.hs b/compiler/GHC/HsToCore/GuardedRHSs.hs
index 8a991e9ceb..88439c9e0c 100644
--- a/compiler/GHC/HsToCore/GuardedRHSs.hs
+++ b/compiler/GHC/HsToCore/GuardedRHSs.hs
@@ -30,6 +30,7 @@ import GHC.Core.Type ( Type )
 import GHC.Utils.Misc
 import GHC.Types.SrcLoc
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Core.Multiplicity
 import Control.Monad ( zipWithM )
 import Data.List.NonEmpty ( NonEmpty, toList )
diff --git a/compiler/GHC/HsToCore/ListComp.hs b/compiler/GHC/HsToCore/ListComp.hs
index 174d0a27af..0ecff073fc 100644
--- a/compiler/GHC/HsToCore/ListComp.hs
+++ b/compiler/GHC/HsToCore/ListComp.hs
@@ -35,6 +35,7 @@ import GHC.HsToCore.Match
 import GHC.Builtin.Names
 import GHC.Types.SrcLoc
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Tc.Utils.TcType
 import GHC.Data.List.SetOps( getNth )
 import GHC.Utils.Misc
diff --git a/compiler/GHC/HsToCore/Match.hs b/compiler/GHC/HsToCore/Match.hs
index 5dc7328879..bc28e2110d 100644
--- a/compiler/GHC/HsToCore/Match.hs
+++ b/compiler/GHC/HsToCore/Match.hs
@@ -59,6 +59,7 @@ import GHC.Data.Maybe
 import GHC.Utils.Misc
 import GHC.Types.Name
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Types.Basic ( isGenerated, il_value, fl_value, Boxity(..) )
 import GHC.Data.FastString
 import GHC.Types.Unique
diff --git a/compiler/GHC/HsToCore/Match/Constructor.hs b/compiler/GHC/HsToCore/Match/Constructor.hs
index 96ab10fa4c..107c072580 100644
--- a/compiler/GHC/HsToCore/Match/Constructor.hs
+++ b/compiler/GHC/HsToCore/Match/Constructor.hs
@@ -36,6 +36,7 @@ import GHC.Types.Name.Env
 import GHC.Types.FieldLabel ( flSelector )
 import GHC.Types.SrcLoc
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import Control.Monad(liftM)
 import Data.List (groupBy)
 import Data.List.NonEmpty (NonEmpty(..))
diff --git a/compiler/GHC/HsToCore/Match/Literal.hs b/compiler/GHC/HsToCore/Match/Literal.hs
index 8b651443d2..a56f729f5e 100644
--- a/compiler/GHC/HsToCore/Match/Literal.hs
+++ b/compiler/GHC/HsToCore/Match/Literal.hs
@@ -53,6 +53,7 @@ import GHC.Utils.Outputable as Outputable
 import GHC.Types.Basic
 import GHC.Driver.Session
 import GHC.Utils.Misc
+import GHC.Utils.Panic
 import GHC.Data.FastString
 import qualified GHC.LanguageExtensions as LangExt
 import GHC.Core.FamInstEnv ( FamInstEnvs, normaliseType )
diff --git a/compiler/GHC/HsToCore/Monad.hs b/compiler/GHC/HsToCore/Monad.hs
index f803939da6..c78b35f6f2 100644
--- a/compiler/GHC/HsToCore/Monad.hs
+++ b/compiler/GHC/HsToCore/Monad.hs
@@ -84,7 +84,9 @@ import GHC.Types.Unique.Supply
 import GHC.Types.Name
 import GHC.Types.Name.Env
 import GHC.Driver.Session
+import GHC.Driver.Ppr
 import GHC.Utils.Error
+import GHC.Utils.Panic
 import GHC.Data.FastString
 import GHC.Types.Unique.FM ( lookupWithDefaultUFM_Directly )
 import GHC.Types.Literal ( mkLitString )
diff --git a/compiler/GHC/HsToCore/PmCheck.hs b/compiler/GHC/HsToCore/PmCheck.hs
index 67667ab90f..564aa12f04 100644
--- a/compiler/GHC/HsToCore/PmCheck.hs
+++ b/compiler/GHC/HsToCore/PmCheck.hs
@@ -41,6 +41,7 @@ import GHC.Builtin.Types
 import GHC.Types.SrcLoc
 import GHC.Utils.Misc
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Core.DataCon
 import GHC.Core.TyCon
 import GHC.Types.Var (EvVar)
diff --git a/compiler/GHC/HsToCore/PmCheck/Oracle.hs b/compiler/GHC/HsToCore/PmCheck/Oracle.hs
index 361ea04971..0a03b05228 100644
--- a/compiler/GHC/HsToCore/PmCheck/Oracle.hs
+++ b/compiler/GHC/HsToCore/PmCheck/Oracle.hs
@@ -33,6 +33,7 @@ import GHC.Driver.Session
 import GHC.Utils.Outputable
 import GHC.Utils.Error
 import GHC.Utils.Misc
+import GHC.Utils.Panic
 import GHC.Data.Bag
 import GHC.Types.Unique.Set
 import GHC.Types.Unique.DSet
diff --git a/compiler/GHC/HsToCore/PmCheck/Ppr.hs b/compiler/GHC/HsToCore/PmCheck/Ppr.hs
index e4358e78b6..99ec5de4af 100644
--- a/compiler/GHC/HsToCore/PmCheck/Ppr.hs
+++ b/compiler/GHC/HsToCore/PmCheck/Ppr.hs
@@ -20,6 +20,7 @@ import GHC.Core.ConLike
 import GHC.Core.DataCon
 import GHC.Builtin.Types
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import Control.Monad.Trans.RWS.CPS
 import GHC.Utils.Misc
 import GHC.Data.Maybe
diff --git a/compiler/GHC/HsToCore/PmCheck/Types.hs b/compiler/GHC/HsToCore/PmCheck/Types.hs
index 2d551fc1aa..f632c723da 100644
--- a/compiler/GHC/HsToCore/PmCheck/Types.hs
+++ b/compiler/GHC/HsToCore/PmCheck/Types.hs
@@ -55,6 +55,7 @@ import GHC.Types.Name
 import GHC.Core.DataCon
 import GHC.Core.ConLike
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Data.List.SetOps (unionLists)
 import GHC.Data.Maybe
 import GHC.Core.Type
diff --git a/compiler/GHC/HsToCore/Quote.hs b/compiler/GHC/HsToCore/Quote.hs
index 1972b3bec0..5710521665 100644
--- a/compiler/GHC/HsToCore/Quote.hs
+++ b/compiler/GHC/HsToCore/Quote.hs
@@ -62,6 +62,7 @@ import GHC.Types.SrcLoc as SrcLoc
 import GHC.Types.Unique
 import GHC.Types.Basic
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Data.Bag
 import GHC.Driver.Session
 import GHC.Data.FastString
diff --git a/compiler/GHC/HsToCore/Usage.hs b/compiler/GHC/HsToCore/Usage.hs
index 12f4c950cb..ef42890302 100644
--- a/compiler/GHC/HsToCore/Usage.hs
+++ b/compiler/GHC/HsToCore/Usage.hs
@@ -25,6 +25,7 @@ import GHC.Utils.Misc
 import GHC.Types.Unique.Set
 import GHC.Types.Unique.FM
 import GHC.Utils.Fingerprint
+import GHC.Utils.Panic
 import GHC.Data.Maybe
 import GHC.Driver.Finder
 
diff --git a/compiler/GHC/HsToCore/Utils.hs b/compiler/GHC/HsToCore/Utils.hs
index 1b0face052..4f0da28586 100644
--- a/compiler/GHC/HsToCore/Utils.hs
+++ b/compiler/GHC/HsToCore/Utils.hs
@@ -77,9 +77,11 @@ import GHC.Unit.Module
 import GHC.Builtin.Names
 import GHC.Types.Name( isInternalName )
 import GHC.Utils.Outputable
+import GHC.Utils.Panic
 import GHC.Types.SrcLoc
 import GHC.Utils.Misc
 import GHC.Driver.Session
+import GHC.Driver.Ppr
 import GHC.Data.FastString
 import qualified GHC.LanguageExtensions as LangExt