diff options
Diffstat (limited to 'testsuite/tests')
19 files changed, 34 insertions, 14 deletions
diff --git a/testsuite/tests/ghc-api/T18522-dbg-ppr.hs b/testsuite/tests/ghc-api/T18522-dbg-ppr.hs index 3b14cc1d8a..8b31eb683d 100644 --- a/testsuite/tests/ghc-api/T18522-dbg-ppr.hs +++ b/testsuite/tests/ghc-api/T18522-dbg-ppr.hs @@ -12,6 +12,7 @@ import GHC.Tc.Module import GHC.Tc.Utils.Zonk import GHC.Utils.Error import GHC.Driver.Types +import GHC.Driver.Ppr import GHC import qualified GHC.LanguageExtensions as LangExt diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs index 4da3acba18..201293178d 100644 --- a/testsuite/tests/ghc-api/T4891/T4891.hs +++ b/testsuite/tests/ghc-api/T4891/T4891.hs @@ -8,6 +8,7 @@ import GHC.Core.DataCon import GHC import GHC.Exts.Heap import GHC.Driver.Types +import GHC.Driver.Ppr import GHC.Runtime.Linker import GHC.Runtime.Heap.Inspect import GHC.Tc.Utils.Env diff --git a/testsuite/tests/ghc-api/T7478/T7478.hs b/testsuite/tests/ghc-api/T7478/T7478.hs index 2e5c735c9c..2fa0f6095e 100644 --- a/testsuite/tests/ghc-api/T7478/T7478.hs +++ b/testsuite/tests/ghc-api/T7478/T7478.hs @@ -8,6 +8,7 @@ import System.Environment import GHC import qualified GHC.Settings.Config as GHC import qualified GHC.Utils.Outputable as GHC +import qualified GHC.Driver.Ppr as GHC import GHC.Driver.Monad (liftIO) import GHC.Utils.Outputable (PprStyle, queryQual) diff --git a/testsuite/tests/ghc-api/T8639_api.hs b/testsuite/tests/ghc-api/T8639_api.hs index 3b7648e397..9c3fa3b7ab 100644 --- a/testsuite/tests/ghc-api/T8639_api.hs +++ b/testsuite/tests/ghc-api/T8639_api.hs @@ -2,6 +2,7 @@ module Main where import GHC import GHC.Driver.Monad +import GHC.Driver.Ppr import GHC.Utils.Outputable import System.IO import System.Environment( getArgs ) diff --git a/testsuite/tests/ghc-api/annotations-literals/literals.hs b/testsuite/tests/ghc-api/annotations-literals/literals.hs index 64c0311c07..c216513a90 100644 --- a/testsuite/tests/ghc-api/annotations-literals/literals.hs +++ b/testsuite/tests/ghc-api/annotations-literals/literals.hs @@ -8,6 +8,7 @@ import Data.List (intercalate) import System.IO import GHC import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Utils.Monad import GHC.Utils.Outputable import GHC.Data.Bag (filterBag,isEmptyBag) @@ -40,4 +41,4 @@ showToks ts = intercalate ",\n\n" $ map (\((L p t),s) -> "(" ++ pp p ++ "," ++ show t ++ ",[" ++ s ++ "])") ts -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a diff --git a/testsuite/tests/ghc-api/annotations-literals/parsed.hs b/testsuite/tests/ghc-api/annotations-literals/parsed.hs index 620bf0451e..3b35373f93 100644 --- a/testsuite/tests/ghc-api/annotations-literals/parsed.hs +++ b/testsuite/tests/ghc-api/annotations-literals/parsed.hs @@ -9,6 +9,7 @@ import Data.List (intercalate) import System.IO import GHC import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Utils.Monad import GHC.Utils.Outputable import GHC.Data.Bag (filterBag,isEmptyBag) @@ -71,7 +72,7 @@ testOneFile libdir fileName = do = ["HsIsString [" ++ src ++ "] " ++ show c] doOverLit _ = [] -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a -- --------------------------------------------------------------------- diff --git a/testsuite/tests/ghc-api/annotations/CheckUtils.hs b/testsuite/tests/ghc-api/annotations/CheckUtils.hs index 3f79f48e28..d3a2b3d80e 100644 --- a/testsuite/tests/ghc-api/annotations/CheckUtils.hs +++ b/testsuite/tests/ghc-api/annotations/CheckUtils.hs @@ -10,6 +10,7 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Utils.Monad import GHC.Utils.Outputable import GHC.Parser.Annotation @@ -76,7 +77,7 @@ showAnns anns = "[\n" ++ (intercalate "\n" $ Map.toList anns) ++ "]\n" -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a -- --------------------------------------------------------------------- diff --git a/testsuite/tests/ghc-api/annotations/annotations.hs b/testsuite/tests/ghc-api/annotations/annotations.hs index 8347b57ffc..933170deb2 100644 --- a/testsuite/tests/ghc-api/annotations/annotations.hs +++ b/testsuite/tests/ghc-api/annotations/annotations.hs @@ -10,6 +10,7 @@ import Data.List (intercalate) import System.IO import GHC import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Utils.Monad import GHC.Utils.Outputable import GHC.Data.Bag (filterBag,isEmptyBag) @@ -58,4 +59,4 @@ showAnns anns = "[\n" ++ (intercalate "\n" $ Map.toList anns) ++ "]\n" -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a diff --git a/testsuite/tests/ghc-api/annotations/comments.hs b/testsuite/tests/ghc-api/annotations/comments.hs index 4da8cbda54..8497c87eda 100644 --- a/testsuite/tests/ghc-api/annotations/comments.hs +++ b/testsuite/tests/ghc-api/annotations/comments.hs @@ -10,6 +10,7 @@ import Data.List (intercalate) import System.IO import GHC import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Utils.Monad import GHC.Utils.Outputable import GHC.Data.Bag (filterBag,isEmptyBag) @@ -67,4 +68,4 @@ showAnns anns = "[\n" ++ (intercalate "\n" showToks ts = intercalate ",\n\n" $ map (\(L p t) -> "(" ++ pp p ++ "," ++ show t ++ ")") ts -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a diff --git a/testsuite/tests/ghc-api/annotations/listcomps.hs b/testsuite/tests/ghc-api/annotations/listcomps.hs index ddc0b7ec7f..115aef6527 100644 --- a/testsuite/tests/ghc-api/annotations/listcomps.hs +++ b/testsuite/tests/ghc-api/annotations/listcomps.hs @@ -11,6 +11,7 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Utils.Monad import GHC.Utils.Outputable import GHC.Parser.Annotation @@ -70,7 +71,7 @@ showAnns anns = "[\n" ++ (intercalate "\n" $ Map.toList anns) ++ "]\n" -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a -- --------------------------------------------------------------------- diff --git a/testsuite/tests/ghc-api/annotations/parseTree.hs b/testsuite/tests/ghc-api/annotations/parseTree.hs index 9c167787be..f566c51d6f 100644 --- a/testsuite/tests/ghc-api/annotations/parseTree.hs +++ b/testsuite/tests/ghc-api/annotations/parseTree.hs @@ -11,6 +11,7 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Utils.Monad import GHC.Utils.Outputable import GHC.Data.Bag (filterBag,isEmptyBag) @@ -64,7 +65,7 @@ showAnns anns = "[\n" ++ (intercalate "\n" $ Map.toList anns) ++ "]\n" -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a -- --------------------------------------------------------------------- diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs index 2bc2638e84..7c35c88996 100644 --- a/testsuite/tests/ghc-api/annotations/stringSource.hs +++ b/testsuite/tests/ghc-api/annotations/stringSource.hs @@ -13,6 +13,7 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Data.FastString import GHC.Types.ForeignCall import GHC.Utils.Monad @@ -95,7 +96,7 @@ showAnns anns = "[\n" ++ (intercalate "\n" $ Map.toList anns) ++ "]\n" -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a -- --------------------------------------------------------------------- diff --git a/testsuite/tests/ghc-api/annotations/t11430.hs b/testsuite/tests/ghc-api/annotations/t11430.hs index d8be3d1043..c7f5801d59 100644 --- a/testsuite/tests/ghc-api/annotations/t11430.hs +++ b/testsuite/tests/ghc-api/annotations/t11430.hs @@ -13,6 +13,7 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Data.FastString import GHC.Types.ForeignCall import GHC.Utils.Monad @@ -82,7 +83,7 @@ showAnns anns = "[\n" ++ (intercalate "\n" $ Map.toList anns) ++ "]\n" -pp a = showPpr unsafeGlobalDynFlags a +pp a = showPprUnsafe a -- --------------------------------------------------------------------- diff --git a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs index 7c782c9167..732321935b 100644 --- a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs +++ b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs @@ -166,7 +166,7 @@ go label mods cnd = hsc_env <- getSession emss <- liftIO $ downsweep hsc_env [] [] False - -- liftIO $ hPutStrLn stderr $ showSDocUnsafe $ ppr $ rights emss + -- liftIO $ hPutStrLn stderr $ showSDoc (hsc_dflags hsc_env) $ ppr $ rights emss -- liftIO $ hPrint stderr $ bagToList $ unionManyBags $ lefts emss it label $ cnd (rights emss) diff --git a/testsuite/tests/hiefile/should_run/HieQueries.hs b/testsuite/tests/hiefile/should_run/HieQueries.hs index f349854dc4..f0b3ee5ba2 100644 --- a/testsuite/tests/hiefile/should_run/HieQueries.hs +++ b/testsuite/tests/hiefile/should_run/HieQueries.hs @@ -14,7 +14,7 @@ import GHC.Iface.Ext.Utils import Data.Maybe (fromJust) import GHC.Driver.Session import GHC.SysTools -import GHC.Utils.Outputable ( Outputable, renderWithStyle, ppr, defaultUserStyle, initSDocContext, text) +import GHC.Utils.Outputable ( Outputable, renderWithStyle, ppr, defaultUserStyle, text) import qualified Data.Map as M import Data.Foldable diff --git a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs index 9481f6e018..1dba8ff3c0 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs @@ -10,6 +10,7 @@ import GHC.Tc.Types import GHC.Hs.Extension import GHC.Hs.Expr import GHC.Utils.Outputable +import GHC.Utils.Panic import GHC.Types.SrcLoc import GHC.Hs import GHC.Hs.Binds diff --git a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs index 4e0eec36c0..dfadc4bc8b 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs @@ -4,7 +4,9 @@ import Control.Monad.IO.Class import Data.List (intercalate) import Data.Maybe (isJust) import GHC.Driver.Plugins +import GHC.Driver.Session import GHC.Driver.Types +import GHC.Driver.Ppr import GHC.Tc.Types import GHC.Hs.Extension import GHC.Types.Avail @@ -42,11 +44,13 @@ typecheckPlugin _ _ tc metaPlugin' :: [CommandLineOption] -> LHsExpr GhcTc -> TcM (LHsExpr GhcTc) metaPlugin' _ meta - = do liftIO $ putStrLn $ "metaPlugin: " ++ (showSDocUnsafe $ ppr meta) + = do dflags <- getDynFlags + liftIO $ putStrLn $ "metaPlugin: " ++ (showSDoc dflags $ ppr meta) return meta interfaceLoadPlugin' :: [CommandLineOption] -> ModIface -> IfM lcl ModIface interfaceLoadPlugin' _ iface - = do liftIO $ putStrLn $ "interfacePlugin: " - ++ (showSDocUnsafe $ ppr $ mi_module iface) + = do dflags <- getDynFlags + liftIO $ putStrLn $ "interfacePlugin: " + ++ (showSDoc dflags $ ppr $ mi_module iface) return iface diff --git a/testsuite/tests/quasiquotation/T7918.hs b/testsuite/tests/quasiquotation/T7918.hs index 1a7de12d42..74cd57ee0f 100644 --- a/testsuite/tests/quasiquotation/T7918.hs +++ b/testsuite/tests/quasiquotation/T7918.hs @@ -3,6 +3,7 @@ module Main (main) where import GHC import GHC.Driver.Session +import GHC.Driver.Ppr import GHC.Utils.Outputable import GHC.Utils.Monad import GHC.Types.Name.Set diff --git a/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs b/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs index e9cd3f34f4..abd7ee5739 100644 --- a/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs +++ b/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs @@ -4,6 +4,7 @@ import GHC.Types.Basic import GHC import GHC.Driver.Monad import GHC.Utils.Outputable +import GHC.Utils.Panic import GHC.Types.RepType import GHC.Builtin.Types.Prim import GHC.Builtin.Types |