diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-06-17 17:11:19 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-18 23:07:47 -0400 |
| commit | 2af0ec9059b94e1fa6b37eda60216e0222e1a53d (patch) | |
| tree | db9449d504a8e0065bf2cbfd1243c4837ad2476a /ghc | |
| parent | da18ff9935e72c7fe6127cb5d5d0c53654a204b0 (diff) | |
| download | haskell-2af0ec9059b94e1fa6b37eda60216e0222e1a53d.tar.gz | |
DynFlags: store default depth in SDocContext (#17957)
It avoids having to use DynFlags to reach for pprUserLength.
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/UI.hs | 2 | ||||
| -rw-r--r-- | ghc/GHCi/UI/Monad.hs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index 2a7f385830..9db2dd5773 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -68,7 +68,7 @@ import GHC.Types.SrcLoc as SrcLoc import qualified GHC.Parser.Lexer as Lexer import GHC.Data.StringBuffer -import GHC.Utils.Outputable hiding ( printForUser, printForUserPartWay ) +import GHC.Utils.Outputable hiding ( printForUser ) import GHC.Runtime.Loader ( initializePlugins ) diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs index 8174c47a8f..63f330d86c 100644 --- a/ghc/GHCi/UI/Monad.hs +++ b/ghc/GHCi/UI/Monad.hs @@ -38,7 +38,7 @@ module GHCi.UI.Monad ( import GHCi.UI.Info (ModInfo) import qualified GHC import GHC.Driver.Monad hiding (liftIO) -import GHC.Utils.Outputable hiding (printForUser, printForUserPartWay) +import GHC.Utils.Outputable hiding (printForUser) import qualified GHC.Utils.Outputable as Outputable import GHC.Types.Name.Occurrence import GHC.Driver.Session @@ -331,26 +331,26 @@ unsetOption opt printForUserNeverQualify :: GhcMonad m => SDoc -> m () printForUserNeverQualify doc = do dflags <- getDynFlags - liftIO $ Outputable.printForUser dflags stdout neverQualify doc + liftIO $ Outputable.printForUser dflags stdout neverQualify AllTheWay doc printForUserModInfo :: GhcMonad m => GHC.ModuleInfo -> SDoc -> m () printForUserModInfo info doc = do dflags <- getDynFlags mUnqual <- GHC.mkPrintUnqualifiedForModule info unqual <- maybe GHC.getPrintUnqual return mUnqual - liftIO $ Outputable.printForUser dflags stdout unqual doc + liftIO $ Outputable.printForUser dflags stdout unqual AllTheWay doc printForUser :: GhcMonad m => SDoc -> m () printForUser doc = do unqual <- GHC.getPrintUnqual dflags <- getDynFlags - liftIO $ Outputable.printForUser dflags stdout unqual doc + liftIO $ Outputable.printForUser dflags stdout unqual AllTheWay doc printForUserPartWay :: GhcMonad m => SDoc -> m () printForUserPartWay doc = do unqual <- GHC.getPrintUnqual dflags <- getDynFlags - liftIO $ Outputable.printForUserPartWay dflags stdout (pprUserLength dflags) unqual doc + liftIO $ Outputable.printForUser dflags stdout unqual Outputable.DefaultDepth doc -- | Run a single Haskell expression runStmt |