Commit 587dcccf authored by Sylvain HENRY's avatar Sylvain HENRY Committed by Ben Gamari
Browse files

Make default output less verbose (source/object paths)

Reviewers: simonmar, mpickering, austin, bgamari

Reviewed By: bgamari

Subscribers: mpickering, nomeata, thomie

Differential Revision: https://phabricator.haskell.org/D2679

GHC Trac Issues: #12807
parent 4e0b8f4d
......@@ -392,6 +392,7 @@ data GeneralFlag
| Opt_WarnIsError -- -Werror; makes warnings fatal
| Opt_ShowWarnGroups -- Show the group a warning belongs to
| Opt_ShowSourcePaths -- Show module source/object paths
| Opt_PrintExplicitForalls
| Opt_PrintExplicitKinds
......@@ -3487,7 +3488,8 @@ fFlagsDeps = [
flagSpec "vectorise" Opt_Vectorise,
flagSpec "version-macros" Opt_VersionMacros,
flagSpec "worker-wrapper" Opt_WorkerWrapper,
flagSpec "show-warning-groups" Opt_ShowWarnGroups
flagSpec "show-warning-groups" Opt_ShowWarnGroups,
flagSpec "show-source-paths" Opt_ShowSourcePaths
]
-- | These @-f\<blah\>@ flags can all be reversed with @-fno-\<blah\>@
......
......@@ -2637,20 +2637,23 @@ instance Outputable ModSummary where
]
showModMsg :: DynFlags -> HscTarget -> Bool -> ModSummary -> String
showModMsg dflags target recomp mod_summary
= showSDoc dflags $
hsep [text (mod_str ++ replicate (max 0 (16 - length mod_str)) ' '),
char '(', text (normalise $ msHsFilePath mod_summary) <> comma,
case target of
HscInterpreted | recomp
-> text "interpreted"
HscNothing -> text "nothing"
_ -> text (normalise $ msObjFilePath mod_summary),
char ')']
where
showModMsg dflags target recomp mod_summary = showSDoc dflags $ hcat
[ text (mod_str ++ replicate (max 1 (17 - length mod_str)) ' ')
, char '('
, text (op $ msHsFilePath mod_summary)
, text " -> "
, case target of
HscInterpreted | recomp -> text "interpreted"
HscNothing -> text "nothing"
_ -> text (op $ msObjFilePath mod_summary)
, char ')'
]
where
op = if verbosity dflags > 1 || gopt Opt_ShowSourcePaths dflags
then normalise
else takeExtension
mod = moduleName (ms_mod mod_summary)
mod_str = showPpr dflags mod
++ hscSourceString (ms_hsc_src mod_summary)
mod_str = showPpr dflags mod ++ hscSourceString (ms_hsc_src mod_summary)
{-
************************************************************************
......
[1 of 2] Processing h
[1 of 1] Compiling H[sig] ( h/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Processing p
[1 of 3] Compiling B ( p/B.hs, nothing )
[2 of 3] Compiling H[sig] ( p/H.hsig, nothing )
[3 of 3] Compiling A ( p/A.hs, nothing )
[1 of 3] Compiling B (.hs -> nothing)
[2 of 3] Compiling H[sig] (.hsig -> nothing)
[3 of 3] Compiling A (.hs -> nothing)
[1 of 5] Processing p
[1 of 2] Compiling T[sig] ( p/T.hsig, nothing )
[2 of 2] Compiling H[sig] ( p/H.hsig, nothing )
[1 of 2] Compiling T[sig] (.hsig -> nothing)
[2 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 5] Processing timpl
Instantiating timpl
[1 of 1] Compiling TImpl ( timpl/TImpl.hs, nothing )
[1 of 1] Compiling TImpl (.hs -> nothing)
[3 of 5] Processing q
[1 of 3] Compiling T[sig] ( q/T.hsig, nothing )
[2 of 3] Compiling H[sig] ( q/H.hsig, nothing )
[3 of 3] Compiling A ( q/A.hs, nothing )
[1 of 3] Compiling T[sig] (.hsig -> nothing)
[2 of 3] Compiling H[sig] (.hsig -> nothing)
[3 of 3] Compiling A (.hs -> nothing)
[4 of 5] Processing r-impl
Instantiating r-impl
[1 of 1] Including timpl
[1 of 2] Compiling H ( r-impl/H.hs, nothing )
[2 of 2] Compiling T ( r-impl/T.hs, nothing )
[1 of 2] Compiling H (.hs -> nothing)
[2 of 2] Compiling T (.hs -> nothing)
[5 of 5] Processing r
Instantiating r
[1 of 1] Including q[H=r-impl:H, T=r-impl:T]
......@@ -20,8 +20,8 @@
[1 of 2] Including timpl
[2 of 2] Including p[H=r-impl:H, T=r-impl:T]
Instantiating p[H=r-impl:H, T=r-impl:T]
[1 of 2] Compiling T[sig] ( p/T.hsig, nothing )
[2 of 2] Compiling H[sig] ( p/H.hsig, nothing )
[1 of 3] Compiling T[sig] ( q/T.hsig, nothing )
[2 of 3] Compiling H[sig] ( q/H.hsig, nothing )
[3 of 3] Compiling A ( q/A.hs, nothing )
[1 of 2] Compiling T[sig] (.hsig -> nothing)
[2 of 2] Compiling H[sig] (.hsig -> nothing)
[1 of 3] Compiling T[sig] (.hsig -> nothing)
[2 of 3] Compiling H[sig] (.hsig -> nothing)
[3 of 3] Compiling A (.hs -> nothing)
[1 of 1] Processing p
[1 of 4] Compiling M1 ( p/M1.hs, nothing )
[2 of 4] Compiling M2 ( p/M2.hs, nothing )
[3 of 4] Compiling A[sig] ( p/A.hsig, nothing )
[4 of 4] Compiling A[sig] ( p/A.hsig, nothing )
[1 of 4] Compiling M1 (.hs -> nothing)
[2 of 4] Compiling M2 (.hs -> nothing)
[3 of 4] Compiling A[sig] (.hsig -> nothing)
[4 of 4] Compiling A[sig] (.hsig -> nothing)
[1 of 1] Processing p
[1 of 3] Compiling A[sig] ( p/A.hsig, nothing )
[2 of 3] Compiling B[sig] ( p/B.hsig, nothing )
[3 of 3] Compiling A[sig] ( p/A.hsig, nothing )
[1 of 3] Compiling A[sig] (.hsig -> nothing)
[2 of 3] Compiling B[sig] (.hsig -> nothing)
[3 of 3] Compiling A[sig] (.hsig -> nothing)
[1 of 3] Processing p
[1 of 2] Compiling A1[sig] ( p/A1.hsig, nothing )
[2 of 2] Compiling A2[sig] ( p/A2.hsig, nothing )
[1 of 2] Compiling A1[sig] (.hsig -> nothing)
[2 of 2] Compiling A2[sig] (.hsig -> nothing)
[2 of 3] Processing q
[1 of 1] Compiling A2[sig] ( q/A2.hsig, nothing )
[1 of 1] Compiling A2[sig] (.hsig -> nothing)
[3 of 3] Processing r
[1 of 2] Compiling A1[sig] ( r/A1.hsig, nothing )
[2 of 2] Compiling A2[sig] ( r/A2.hsig, nothing )
[1 of 2] Compiling A1[sig] (.hsig -> nothing)
[2 of 2] Compiling A2[sig] (.hsig -> nothing)
[1 of 4] Processing p
[1 of 2] Compiling H[sig] ( p/H.hsig, nothing )
[2 of 2] Compiling A ( p/A.hs, nothing )
[1 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Compiling A (.hs -> nothing)
[2 of 4] Processing q
[1 of 1] Compiling H[sig] ( q/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[3 of 4] Processing h
Instantiating h
[1 of 1] Compiling H ( h/H.hs, bkp01.out/h/H.o )
[1 of 1] Compiling H (.hs -> .o)
[4 of 4] Processing r
Instantiating r
[1 of 2] Including h
......@@ -13,6 +13,6 @@
Instantiating q[H=h:H]
[1 of 1] Including p[H=h:H]
Instantiating p[H=h:H]
[1 of 2] Compiling H[sig] ( p/H.hsig, bkp01.out/p/p-6KeuBvYi0jvLWqVbkSAZMq/H.o )
[2 of 2] Compiling A ( p/A.hs, bkp01.out/p/p-6KeuBvYi0jvLWqVbkSAZMq/A.o )
[1 of 1] Compiling H[sig] ( q/H.hsig, bkp01.out/q/q-6KeuBvYi0jvLWqVbkSAZMq/H.o )
[1 of 2] Compiling H[sig] (.hsig -> .o)
[2 of 2] Compiling A (.hs -> .o)
[1 of 1] Compiling H[sig] (.hsig -> .o)
[1 of 3] Processing p
[1 of 2] Compiling H[sig] ( p/H.hsig, nothing )
[2 of 2] Compiling A ( p/A.hs, nothing )
[1 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Compiling A (.hs -> nothing)
[2 of 3] Processing q
Instantiating q
[1 of 1] Compiling H ( q/H.hs, bkp02.out/q/H.o )
[1 of 1] Compiling H (.hs -> .o)
[3 of 3] Processing r
Instantiating r
[1 of 2] Including q
[2 of 2] Including p[H=q:H]
Instantiating p[H=q:H]
[1 of 2] Compiling H[sig] ( p/H.hsig, bkp02.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/H.o )
[2 of 2] Compiling A ( p/A.hs, bkp02.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/A.o )
[1 of 1] Compiling R ( r/R.hs, bkp02.out/r/R.o )
[1 of 2] Compiling H[sig] (.hsig -> .o)
[2 of 2] Compiling A (.hs -> .o)
[1 of 1] Compiling R (.hs -> .o)
[1 of 2] Processing p
[1 of 1] Compiling A[sig] ( p/A.hsig, nothing )
[1 of 1] Compiling A[sig] (.hsig -> nothing)
[2 of 2] Processing q
[1 of 2] Compiling A[sig] ( q/A.hsig, nothing )
[2 of 2] Compiling B ( q/B.hs, nothing )
[1 of 2] Compiling A[sig] (.hsig -> nothing)
[2 of 2] Compiling B (.hs -> nothing)
[1 of 3] Processing q
Instantiating q
[1 of 1] Compiling H ( q/H.hs, bkp08.out/q/H.o )
[1 of 1] Compiling H (.hs -> .o)
[2 of 3] Processing r
[1 of 1] Compiling H[sig] ( r/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[3 of 3] Processing p
Instantiating p
[1 of 2] Including q
[2 of 2] Including r[H=q:H]
Instantiating r[H=q:H]
[1 of 1] Compiling H[sig] ( r/H.hsig, bkp08.out/r/r-D5Mg3foBSCrDbQDKH4WGSG/H.o )
[1 of 1] Compiling M ( p/M.hs, bkp08.out/p/M.o )
[1 of 1] Compiling H[sig] (.hsig -> .o)
[1 of 1] Compiling M (.hs -> .o)
......@@ -2,15 +2,15 @@
bkp09.bkp:1:26: warning:
-XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
[1 of 5] Processing p
[1 of 1] Compiling H[sig] ( p/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[2 of 5] Processing q
[1 of 1] Compiling H[sig] ( q/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[3 of 5] Processing r
[1 of 2] Compiling H[sig] ( r/H.hsig, nothing )
[2 of 2] Compiling M ( r/M.hs, nothing )
[1 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Compiling M (.hs -> nothing)
[4 of 5] Processing h-impl
Instantiating h-impl
[1 of 1] Compiling H ( h-impl/H.hs, bkp09.out/h-impl/H.o )
[1 of 1] Compiling H (.hs -> .o)
[5 of 5] Processing s
Instantiating s
[1 of 2] Including h-impl
......@@ -18,9 +18,9 @@ bkp09.bkp:1:26: warning:
Instantiating r[H=h-impl:H]
[1 of 2] Including p[H=h-impl:H]
Instantiating p[H=h-impl:H]
[1 of 1] Compiling H[sig] ( p/H.hsig, bkp09.out/p/p-5FYQgnNkfSvBT5yogOxPpf/H.o )
[1 of 1] Compiling H[sig] (.hsig -> .o)
[2 of 2] Including q[H=h-impl:H]
Instantiating q[H=h-impl:H]
[1 of 1] Compiling H[sig] ( q/H.hsig, bkp09.out/q/q-5FYQgnNkfSvBT5yogOxPpf/H.o )
[1 of 2] Compiling H[sig] ( r/H.hsig, bkp09.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o )
[2 of 2] Compiling M ( r/M.hs, bkp09.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o )
[1 of 1] Compiling H[sig] (.hsig -> .o)
[1 of 2] Compiling H[sig] (.hsig -> .o)
[2 of 2] Compiling M (.hs -> .o)
[1 of 2] Processing p
[1 of 2] Compiling H[sig] ( p/H.hsig, nothing )
[2 of 2] Compiling A ( p/A.hs, nothing )
[1 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Compiling A (.hs -> nothing)
[2 of 2] Processing q
[1 of 2] Compiling H2[sig] ( q/H2.hsig, nothing )
[2 of 2] Compiling B ( q/B.hs, nothing )
[1 of 2] Compiling H2[sig] (.hsig -> nothing)
[2 of 2] Compiling B (.hs -> nothing)
[1 of 2] Processing p
[1 of 3] Compiling H[sig] ( p/H.hsig, nothing )
[2 of 3] Compiling H2[sig] ( p/H2.hsig, nothing )
[3 of 3] Compiling A ( p/A.hs, nothing )
[1 of 3] Compiling H[sig] (.hsig -> nothing)
[2 of 3] Compiling H2[sig] (.hsig -> nothing)
[3 of 3] Compiling A (.hs -> nothing)
[2 of 2] Processing q
[1 of 2] Compiling H[sig] ( q/H.hsig, nothing )
[2 of 2] Compiling B ( q/B.hs, nothing )
[1 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Compiling B (.hs -> nothing)
[1 of 4] Processing p
[1 of 1] Compiling H[sig] ( p/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[2 of 4] Processing r
[1 of 2] Compiling H[sig] ( r/H.hsig, nothing )
[2 of 2] Compiling M ( r/M.hs, nothing )
[1 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Compiling M (.hs -> nothing)
[3 of 4] Processing h-impl
Instantiating h-impl
[1 of 1] Compiling H ( h-impl/H.hs, bkp12.out/h-impl/H.o )
[1 of 1] Compiling H (.hs -> .o)
[4 of 4] Processing s
Instantiating s
[1 of 2] Including h-impl
......@@ -13,6 +13,6 @@
Instantiating r[H=h-impl:H]
[1 of 1] Including p[H=h-impl:H]
Instantiating p[H=h-impl:H]
[1 of 1] Compiling H[sig] ( p/H.hsig, bkp12.out/p/p-5FYQgnNkfSvBT5yogOxPpf/H.o )
[1 of 2] Compiling H[sig] ( r/H.hsig, bkp12.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o )
[2 of 2] Compiling M ( r/M.hs, bkp12.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o )
[1 of 1] Compiling H[sig] (.hsig -> .o)
[1 of 2] Compiling H[sig] (.hsig -> .o)
[2 of 2] Compiling M (.hs -> .o)
[1 of 3] Processing p
[1 of 3] Compiling H[sig] ( p/H.hsig, nothing )
[2 of 3] Compiling Y[sig] ( p/Y.hsig, nothing )
[3 of 3] Compiling M ( p/M.hs, nothing )
[1 of 3] Compiling H[sig] (.hsig -> nothing)
[2 of 3] Compiling Y[sig] (.hsig -> nothing)
[3 of 3] Compiling M (.hs -> nothing)
[2 of 3] Processing impl
Instantiating impl
[1 of 2] Compiling F ( impl/F.hs, bkp14.out/impl/F.o )
[2 of 2] Compiling H ( impl/H.hs, bkp14.out/impl/H.o )
[1 of 2] Compiling F (.hs -> .o)
[2 of 2] Compiling H (.hs -> .o)
[3 of 3] Processing q
[1 of 2] Compiling Y[sig] ( q/Y.hsig, nothing )
[2 of 2] Compiling X ( q/X.hs, nothing )
[1 of 2] Compiling Y[sig] (.hsig -> nothing)
[2 of 2] Compiling X (.hs -> nothing)
......@@ -2,24 +2,24 @@
bkp15.bkp:1:26: warning:
-XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
[1 of 5] Processing p
[1 of 1] Compiling H[sig] ( p/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[2 of 5] Processing q
[1 of 1] Compiling H[sig] ( q/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[3 of 5] Processing r
[1 of 2] Compiling H[sig] ( r/H.hsig, nothing )
[2 of 2] Compiling M ( r/M.hs, nothing )
[1 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Compiling M (.hs -> nothing)
[4 of 5] Processing h-impl
Instantiating h-impl
[1 of 1] Compiling H ( h-impl/H.hs, bkp15.out/h-impl/H.o )
[1 of 1] Compiling H (.hs -> .o)
[5 of 5] Processing s
Instantiating s
[1 of 1] Including r[H=h-impl:H]
Instantiating r[H=h-impl:H]
[1 of 2] Including p[H=h-impl:H]
Instantiating p[H=h-impl:H]
[1 of 1] Compiling H[sig] ( p/H.hsig, bkp15.out/p/p-5FYQgnNkfSvBT5yogOxPpf/H.o )
[1 of 1] Compiling H[sig] (.hsig -> .o)
[2 of 2] Including q[H=h-impl:H]
Instantiating q[H=h-impl:H]
[1 of 1] Compiling H[sig] ( q/H.hsig, bkp15.out/q/q-5FYQgnNkfSvBT5yogOxPpf/H.o )
[1 of 2] Compiling H[sig] ( r/H.hsig, bkp15.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o )
[2 of 2] Compiling M ( r/M.hs, bkp15.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o )
[1 of 1] Compiling H[sig] (.hsig -> .o)
[1 of 2] Compiling H[sig] (.hsig -> .o)
[2 of 2] Compiling M (.hs -> .o)
[1 of 2] Processing p
[1 of 1] Compiling Int[sig] ( p/Int.hsig, nothing )
[1 of 1] Compiling Int[sig] (.hsig -> nothing)
[2 of 2] Processing q
Instantiating q
[1 of 1] Including p[Int=base-4.9.0.0:GHC.Exts]
Instantiating p[Int=base-4.9.0.0:GHC.Exts]
[1 of 1] Including ghc-prim-0.5.0.0
[1 of 1] Compiling Int[sig] ( p/Int.hsig, bkp16.out/p/p-97PZnzqiJmd2hTwUNGdjod/Int.o )
[1 of 1] Compiling Int[sig] (.hsig -> .o)
[1 of 3] Processing p
[1 of 1] Compiling H[sig] ( p/H.hsig, nothing )
[1 of 1] Compiling H[sig] (.hsig -> nothing)
[2 of 3] Processing q
Instantiating q
[1 of 1] Compiling M ( q/M.hs, bkp17.out/q/M.o )
[1 of 1] Compiling M (.hs -> .o)
[3 of 3] Processing r
Instantiating r
[1 of 1] Including p[H=q:M]
Instantiating p[H=q:M]
[1 of 1] Compiling H[sig] ( p/H.hsig, bkp17.out/p/p-Bk81HcBu6NbDb1eswyn055/H.o )
[1 of 1] Compiling H[sig] (.hsig -> .o)
[1 of 3] Processing r
[1 of 2] Compiling H[sig] ( r/H.hsig, nothing )
[2 of 2] Compiling M ( r/M.hs, nothing )
[1 of 2] Compiling H[sig] (.hsig -> nothing)
[2 of 2] Compiling M (.hs -> nothing)
[2 of 3] Processing h-impl
Instantiating h-impl
[1 of 2] Compiling A ( h-impl/A.hs, bkp18.out/h-impl/A.o )
[2 of 2] Compiling H ( h-impl/H.hs, bkp18.out/h-impl/H.o )
[1 of 2] Compiling A (.hs -> .o)
[2 of 2] Compiling H (.hs -> .o)
[3 of 3] Processing s
Instantiating s
[1 of 1] Including r[H=h-impl:H]
Instantiating r[H=h-impl:H]
[1 of 2] Compiling H[sig] ( r/H.hsig, bkp18.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o )
[2 of 2] Compiling M ( r/M.hs, bkp18.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o )
[1 of 2] Compiling H[sig] (.hsig -> .o)
[2 of 2] Compiling M (.hs -> .o)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment