[commit: ghc] master: ghci: tweak option list indentation in ':show packages' (af1fc53)

git at git.haskell.org git at git.haskell.org
Thu Aug 7 15:52:17 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/af1fc53a157c179854fd0e03e0a8e17c2295e547/ghc

>---------------------------------------------------------------

commit af1fc53a157c179854fd0e03e0a8e17c2295e547
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Thu Aug 7 18:48:03 2014 +0300

    ghci: tweak option list indentation in ':show packages'
    
    Summary:
    Caught by './validate --slow' in 'ghci/scripts/ghci024'.
    
    Commit 207875293fea07aa90efe215369629b657d1875a changed indentation a bit:
    
        --- ./ghci/scripts/ghci024.stdout       2014-07-31 12:05:34.000000000 +0300
        +++ ./ghci/scripts/ghci024.run.stdout   2014-08-07 17:19:23.000000000 +0300
        @@ -33,4 +33,4 @@
         active package flags: none
         ~~~~~~~~~~ Testing :show packages, including the ghc package
         active package flags:
        -  -package ghc
        +-package ghc
    
    Patch restores indentation.
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    
    Test Plan: passed validate, tested manually
    
    Reviewers: austin, ezyang
    
    Reviewed By: ezyang
    
    Subscribers: phaskell, simonmar, relrod, ezyang, carter
    
    Differential Revision: https://phabricator.haskell.org/D126


>---------------------------------------------------------------

af1fc53a157c179854fd0e03e0a8e17c2295e547
 ghc/InteractiveUI.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index 386d4df..3d871d9 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -2331,9 +2331,9 @@ showPackages :: GHCi ()
 showPackages = do
   dflags <- getDynFlags
   let pkg_flags = packageFlags dflags
-  liftIO $ putStrLn $ showSDoc dflags $ vcat $
-    text ("active package flags:"++if null pkg_flags then " none" else "")
-    : map pprFlag pkg_flags
+  liftIO $ putStrLn $ showSDoc dflags $
+    text ("active package flags:"++if null pkg_flags then " none" else "") $$
+      nest 2 (vcat (map pprFlag pkg_flags))
 
 showPaths :: GHCi ()
 showPaths = do



More information about the ghc-commits mailing list