diff options
| author | Sylvain HENRY <hsyl20@gmail.com> | 2016-11-11 22:54:05 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-11 22:54:07 -0500 |
| commit | 587dcccfdfa7a319e27300a4f3885071060b1f8e (patch) | |
| tree | 55f4e8748192e532b6811bad65615c017d1dcea8 | |
| parent | 4e0b8f4d80a02be797d4fed099c1195f1bcd1189 (diff) | |
| download | haskell-587dcccfdfa7a319e27300a4f3885071060b1f8e.tar.gz | |
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
170 files changed, 632 insertions, 622 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 479b50d0ea..126b4575f6 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -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\>@ diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs index 44b5634008..cd1878ffe9 100644 --- a/compiler/main/HscTypes.hs +++ b/compiler/main/HscTypes.hs @@ -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) {- ************************************************************************ diff --git a/testsuite/tests/backpack/reexport/bkpreex01.stderr b/testsuite/tests/backpack/reexport/bkpreex01.stderr index ac80b79800..4af5b6bfee 100644 --- a/testsuite/tests/backpack/reexport/bkpreex01.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex01.stderr @@ -1,6 +1,6 @@ [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) diff --git a/testsuite/tests/backpack/reexport/bkpreex02.stderr b/testsuite/tests/backpack/reexport/bkpreex02.stderr index 44c07c44ff..0d79f3d5ab 100644 --- a/testsuite/tests/backpack/reexport/bkpreex02.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex02.stderr @@ -1,18 +1,18 @@ [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) diff --git a/testsuite/tests/backpack/reexport/bkpreex03.stderr b/testsuite/tests/backpack/reexport/bkpreex03.stderr index 7d900da7d2..87c962912f 100644 --- a/testsuite/tests/backpack/reexport/bkpreex03.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex03.stderr @@ -1,5 +1,5 @@ [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) diff --git a/testsuite/tests/backpack/reexport/bkpreex04.stderr b/testsuite/tests/backpack/reexport/bkpreex04.stderr index a21cf89027..f41bd79688 100644 --- a/testsuite/tests/backpack/reexport/bkpreex04.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex04.stderr @@ -1,4 +1,4 @@ [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) diff --git a/testsuite/tests/backpack/reexport/bkpreex06.stderr b/testsuite/tests/backpack/reexport/bkpreex06.stderr index 225a8aacc8..d4154ab1f9 100644 --- a/testsuite/tests/backpack/reexport/bkpreex06.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex06.stderr @@ -1,8 +1,8 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp01.stderr b/testsuite/tests/backpack/should_compile/bkp01.stderr index 51cc4b7cdd..414536ac9b 100644 --- a/testsuite/tests/backpack/should_compile/bkp01.stderr +++ b/testsuite/tests/backpack/should_compile/bkp01.stderr @@ -1,11 +1,11 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp02.stderr b/testsuite/tests/backpack/should_compile/bkp02.stderr index ace97e4b63..3971e06464 100644 --- a/testsuite/tests/backpack/should_compile/bkp02.stderr +++ b/testsuite/tests/backpack/should_compile/bkp02.stderr @@ -1,14 +1,14 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp07.stderr b/testsuite/tests/backpack/should_compile/bkp07.stderr index 2ccfaac56a..54af6a9c7d 100644 --- a/testsuite/tests/backpack/should_compile/bkp07.stderr +++ b/testsuite/tests/backpack/should_compile/bkp07.stderr @@ -1,5 +1,5 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp08.stderr b/testsuite/tests/backpack/should_compile/bkp08.stderr index e81e013bc1..e3afb743c1 100644 --- a/testsuite/tests/backpack/should_compile/bkp08.stderr +++ b/testsuite/tests/backpack/should_compile/bkp08.stderr @@ -1,12 +1,12 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp09.stderr b/testsuite/tests/backpack/should_compile/bkp09.stderr index 24abba259f..55491779a1 100644 --- a/testsuite/tests/backpack/should_compile/bkp09.stderr +++ b/testsuite/tests/backpack/should_compile/bkp09.stderr @@ -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) diff --git a/testsuite/tests/backpack/should_compile/bkp10.stderr b/testsuite/tests/backpack/should_compile/bkp10.stderr index 350670e6d4..44ed686f5a 100644 --- a/testsuite/tests/backpack/should_compile/bkp10.stderr +++ b/testsuite/tests/backpack/should_compile/bkp10.stderr @@ -1,6 +1,6 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp11.stderr b/testsuite/tests/backpack/should_compile/bkp11.stderr index a804563b2d..f2819ee58b 100644 --- a/testsuite/tests/backpack/should_compile/bkp11.stderr +++ b/testsuite/tests/backpack/should_compile/bkp11.stderr @@ -1,7 +1,7 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp12.stderr b/testsuite/tests/backpack/should_compile/bkp12.stderr index dc4debe3f3..d41128bfb0 100644 --- a/testsuite/tests/backpack/should_compile/bkp12.stderr +++ b/testsuite/tests/backpack/should_compile/bkp12.stderr @@ -1,11 +1,11 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp14.stderr b/testsuite/tests/backpack/should_compile/bkp14.stderr index b5b40b7eff..bb46d1ad9b 100644 --- a/testsuite/tests/backpack/should_compile/bkp14.stderr +++ b/testsuite/tests/backpack/should_compile/bkp14.stderr @@ -1,11 +1,11 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp15.stderr b/testsuite/tests/backpack/should_compile/bkp15.stderr index 904ab2d4cb..28a5ec6563 100644 --- a/testsuite/tests/backpack/should_compile/bkp15.stderr +++ b/testsuite/tests/backpack/should_compile/bkp15.stderr @@ -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) diff --git a/testsuite/tests/backpack/should_compile/bkp16.stderr b/testsuite/tests/backpack/should_compile/bkp16.stderr index f35021fe11..f93bf0dd97 100644 --- a/testsuite/tests/backpack/should_compile/bkp16.stderr +++ b/testsuite/tests/backpack/should_compile/bkp16.stderr @@ -1,8 +1,8 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp17.stderr b/testsuite/tests/backpack/should_compile/bkp17.stderr index a52394dcaf..87b8baf253 100644 --- a/testsuite/tests/backpack/should_compile/bkp17.stderr +++ b/testsuite/tests/backpack/should_compile/bkp17.stderr @@ -1,10 +1,10 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp18.stderr b/testsuite/tests/backpack/should_compile/bkp18.stderr index e14b99431c..5da5dd19b7 100644 --- a/testsuite/tests/backpack/should_compile/bkp18.stderr +++ b/testsuite/tests/backpack/should_compile/bkp18.stderr @@ -1,13 +1,13 @@ [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) diff --git a/testsuite/tests/backpack/should_compile/bkp19.stderr b/testsuite/tests/backpack/should_compile/bkp19.stderr index 952fd0ae0c..5da5dd19b7 100644 --- a/testsuite/tests/backpack/should_compile/bkp19.stderr +++ b/testsuite/tests/backpack/should_compile/bkp19.stderr @@ -1,13 +1,13 @@ [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, bkp19.out/h-impl/A.o ) - [2 of 2] Compiling H ( h-impl/H.hs, bkp19.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, bkp19.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [2 of 2] Compiling M ( r/M.hs, bkp19.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [1 of 2] Compiling H[sig] (.hsig -> .o) + [2 of 2] Compiling M (.hs -> .o) diff --git a/testsuite/tests/backpack/should_compile/bkp20.stderr b/testsuite/tests/backpack/should_compile/bkp20.stderr index 4dfdd7c337..1088e262a7 100644 --- a/testsuite/tests/backpack/should_compile/bkp20.stderr +++ b/testsuite/tests/backpack/should_compile/bkp20.stderr @@ -1,22 +1,22 @@ [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, bkp20.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, bkp20.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, bkp20.out/q/q-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [1 of 2] Compiling H[sig] ( r/H.hsig, bkp20.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [2 of 2] Compiling M ( r/M.hs, bkp20.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) diff --git a/testsuite/tests/backpack/should_compile/bkp21.stderr b/testsuite/tests/backpack/should_compile/bkp21.stderr index abfe9ceffc..1e82afc624 100644 --- a/testsuite/tests/backpack/should_compile/bkp21.stderr +++ b/testsuite/tests/backpack/should_compile/bkp21.stderr @@ -1,10 +1,10 @@ [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 pq0 - [1 of 1] Compiling H[sig] ( pq0/H.hsig, nothing ) + [1 of 1] Compiling H[sig] (.hsig -> nothing) [4 of 5] Processing pq1 - [1 of 1] Compiling H[sig] ( pq1/H.hsig, nothing ) + [1 of 1] Compiling H[sig] (.hsig -> nothing) [5 of 5] Processing pq2 - [1 of 1] Compiling H[sig] ( pq2/H.hsig, nothing ) + [1 of 1] Compiling H[sig] (.hsig -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp23.stderr b/testsuite/tests/backpack/should_compile/bkp23.stderr index ea30294f15..8c79147720 100644 --- a/testsuite/tests/backpack/should_compile/bkp23.stderr +++ b/testsuite/tests/backpack/should_compile/bkp23.stderr @@ -1,24 +1,24 @@ [1 of 6] 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 M ( p/M.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling M (.hs -> nothing) [2 of 6] Processing q1 - [1 of 3] Compiling A[sig] ( q1/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q1/B.hsig, nothing ) - [3 of 3] Compiling Q ( q1/Q.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling Q (.hs -> nothing) [3 of 6] Processing q2 - [1 of 3] Compiling A[sig] ( q2/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q2/B.hsig, nothing ) - [3 of 3] Compiling Q ( q2/Q.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling Q (.hs -> nothing) [4 of 6] Processing q3 - [1 of 3] Compiling A[sig] ( q3/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q3/B.hsig, nothing ) - [3 of 3] Compiling Q ( q3/Q.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling Q (.hs -> nothing) [5 of 6] Processing q4 - [1 of 3] Compiling A[sig] ( q4/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q4/B.hsig, nothing ) - [3 of 3] Compiling Q ( q4/Q.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling Q (.hs -> nothing) [6 of 6] Processing q5 - [1 of 3] Compiling A[sig] ( q5/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q5/B.hsig, nothing ) - [3 of 3] Compiling Q ( q5/Q.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling Q (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp24.stderr b/testsuite/tests/backpack/should_compile/bkp24.stderr index 73e1f9d6fb..953cf6fdf9 100644 --- a/testsuite/tests/backpack/should_compile/bkp24.stderr +++ b/testsuite/tests/backpack/should_compile/bkp24.stderr @@ -1,27 +1,27 @@ [1 of 5] 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 P ( p/P.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling P (.hs -> nothing) [2 of 5] Processing a Instantiating a - [1 of 1] Compiling A ( a/A.hs, bkp24.out/a/A.o ) + [1 of 1] Compiling A (.hs -> .o) [3 of 5] Processing b Instantiating b - [1 of 1] Compiling B ( b/B.hs, bkp24.out/b/B.o ) + [1 of 1] Compiling B (.hs -> .o) [4 of 5] Processing q - [1 of 2] Compiling B[sig] ( q/B.hsig, nothing ) - [2 of 2] Compiling Q ( q/Q.hs, nothing ) + [1 of 2] Compiling B[sig] (.hsig -> nothing) + [2 of 2] Compiling Q (.hs -> nothing) [5 of 5] Processing r Instantiating r [1 of 2] Including q[B=b:B] Instantiating q[B=b:B] [1 of 2] Including p[A=a:A, B=b:B] Instantiating p[A=a:A, B=b:B] - [1 of 3] Compiling A[sig] ( p/A.hsig, bkp24.out/p/p-BVwzUlgOVR6H8V9umpUZ2h/A.o ) - [2 of 3] Compiling B[sig] ( p/B.hsig, bkp24.out/p/p-BVwzUlgOVR6H8V9umpUZ2h/B.o ) - [3 of 3] Compiling P ( p/P.hs, bkp24.out/p/p-BVwzUlgOVR6H8V9umpUZ2h/P.o ) + [1 of 3] Compiling A[sig] (.hsig -> .o) + [2 of 3] Compiling B[sig] (.hsig -> .o) + [3 of 3] Compiling P (.hs -> .o) [2 of 2] Including a - [1 of 2] Compiling B[sig] ( q/B.hsig, bkp24.out/q/q-3IeW1YRs0cYLmV4oNjoWji/B.o ) - [2 of 2] Compiling Q ( q/Q.hs, bkp24.out/q/q-3IeW1YRs0cYLmV4oNjoWji/Q.o ) + [1 of 2] Compiling B[sig] (.hsig -> .o) + [2 of 2] Compiling Q (.hs -> .o) [2 of 2] Including b - [1 of 1] Compiling R ( r/R.hs, bkp24.out/r/R.o ) + [1 of 1] Compiling R (.hs -> .o) diff --git a/testsuite/tests/backpack/should_compile/bkp25.stderr b/testsuite/tests/backpack/should_compile/bkp25.stderr index 55d6e4850a..afa3c4c97f 100644 --- a/testsuite/tests/backpack/should_compile/bkp25.stderr +++ b/testsuite/tests/backpack/should_compile/bkp25.stderr @@ -1,11 +1,11 @@ [1 of 3] 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 P ( p/P.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling P (.hs -> nothing) [2 of 3] Processing r Instantiating r - [1 of 1] Compiling Impl ( r/Impl.hs, bkp25.out/r/Impl.o ) + [1 of 1] Compiling Impl (.hs -> .o) [3 of 3] Processing q - [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q/B.hsig, nothing ) - [3 of 3] Compiling M ( q/M.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling B[sig] (.hsig -> nothing) + [3 of 3] Compiling M (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp26.stderr b/testsuite/tests/backpack/should_compile/bkp26.stderr index 64960b15c7..4770fe19ec 100644 --- a/testsuite/tests/backpack/should_compile/bkp26.stderr +++ b/testsuite/tests/backpack/should_compile/bkp26.stderr @@ -1,13 +1,13 @@ [1 of 3] Processing p - [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) - [2 of 2] Compiling P ( p/P.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling P (.hs -> nothing) [2 of 3] Processing r Instantiating r - [1 of 1] Compiling A ( r/A.hs, bkp26.out/r/A.o ) + [1 of 1] Compiling A (.hs -> .o) [3 of 3] Processing q Instantiating q [1 of 1] Including p[A=r:A] Instantiating p[A=r:A] - [1 of 2] Compiling A[sig] ( p/A.hsig, bkp26.out/p/p-8YQRY0unRYZCev5HBjXieS/A.o ) - [2 of 2] Compiling P ( p/P.hs, bkp26.out/p/p-8YQRY0unRYZCev5HBjXieS/P.o ) - [1 of 1] Compiling M ( q/M.hs, bkp26.out/q/M.o ) + [1 of 2] Compiling A[sig] (.hsig -> .o) + [2 of 2] Compiling P (.hs -> .o) + [1 of 1] Compiling M (.hs -> .o) diff --git a/testsuite/tests/backpack/should_compile/bkp27.stderr b/testsuite/tests/backpack/should_compile/bkp27.stderr index 72722ed2ea..b1f2a7f0b1 100644 --- a/testsuite/tests/backpack/should_compile/bkp27.stderr +++ b/testsuite/tests/backpack/should_compile/bkp27.stderr @@ -1,14 +1,14 @@ [1 of 3] Processing p - [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) - [2 of 2] Compiling P ( p/P.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling P (.hs -> nothing) [2 of 3] Processing r Instantiating r - [1 of 1] Compiling A ( r/A.hs, bkp27.out/r/A.o ) + [1 of 1] Compiling A (.hs -> .o) [3 of 3] Processing q Instantiating q [1 of 2] Including p[A=r:A] Instantiating p[A=r:A] - [1 of 2] Compiling A[sig] ( p/A.hsig, bkp27.out/p/p-8YQRY0unRYZCev5HBjXieS/A.o ) - [2 of 2] Compiling P ( p/P.hs, bkp27.out/p/p-8YQRY0unRYZCev5HBjXieS/P.o ) + [1 of 2] Compiling A[sig] (.hsig -> .o) + [2 of 2] Compiling P (.hs -> .o) [2 of 2] Including r - [1 of 1] Compiling M ( q/M.hs, bkp27.out/q/M.o ) + [1 of 1] Compiling M (.hs -> .o) diff --git a/testsuite/tests/backpack/should_compile/bkp28.stderr b/testsuite/tests/backpack/should_compile/bkp28.stderr index 9ea43fcb45..92b36b6ff5 100644 --- a/testsuite/tests/backpack/should_compile/bkp28.stderr +++ b/testsuite/tests/backpack/should_compile/bkp28.stderr @@ -1,8 +1,8 @@ [1 of 3] Processing i Instantiating i - [1 of 1] Compiling I ( i/I.hs, bkp28.out/i/I.o ) + [1 of 1] Compiling I (.hs -> .o) [2 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [3 of 3] 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) diff --git a/testsuite/tests/backpack/should_compile/bkp29.stderr b/testsuite/tests/backpack/should_compile/bkp29.stderr index 1f4652b3a2..9f72be8ff6 100644 --- a/testsuite/tests/backpack/should_compile/bkp29.stderr +++ b/testsuite/tests/backpack/should_compile/bkp29.stderr @@ -1,7 +1,7 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q - [1 of 1] Compiling B[sig] ( q/B.hsig, nothing ) + [1 of 1] Compiling B[sig] (.hsig -> nothing) [3 of 3] Processing r - [1 of 2] Compiling C[sig] ( r/C.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 2] Compiling C[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp30.stderr b/testsuite/tests/backpack/should_compile/bkp30.stderr index 1f4652b3a2..9f72be8ff6 100644 --- a/testsuite/tests/backpack/should_compile/bkp30.stderr +++ b/testsuite/tests/backpack/should_compile/bkp30.stderr @@ -1,7 +1,7 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q - [1 of 1] Compiling B[sig] ( q/B.hsig, nothing ) + [1 of 1] Compiling B[sig] (.hsig -> nothing) [3 of 3] Processing r - [1 of 2] Compiling C[sig] ( r/C.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 2] Compiling C[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp31.stderr b/testsuite/tests/backpack/should_compile/bkp31.stderr index 523a635d3a..17e5bff404 100644 --- a/testsuite/tests/backpack/should_compile/bkp31.stderr +++ b/testsuite/tests/backpack/should_compile/bkp31.stderr @@ -1,8 +1,8 @@ [1 of 2] Processing ab-sigs - [1 of 2] Compiling A[sig] ( ab-sigs/A.hsig, nothing ) - [2 of 2] Compiling B[sig] ( ab-sigs/B.hsig, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling B[sig] (.hsig -> nothing) [2 of 2] Processing abcd-holes - [1 of 4] Compiling C ( abcd-holes/C.hs, nothing ) - [2 of 4] Compiling B[sig] ( abcd-holes/B.hsig, nothing ) - [3 of 4] Compiling A[sig] ( abcd-holes/A.hsig, nothing ) - [4 of 4] Compiling D ( abcd-holes/D.hs, nothing ) + [1 of 4] Compiling C (.hs -> nothing) + [2 of 4] Compiling B[sig] (.hsig -> nothing) + [3 of 4] Compiling A[sig] (.hsig -> nothing) + [4 of 4] Compiling D (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp32.stderr b/testsuite/tests/backpack/should_compile/bkp32.stderr index c2cea8c2b0..48f19d2cc6 100644 --- a/testsuite/tests/backpack/should_compile/bkp32.stderr +++ b/testsuite/tests/backpack/should_compile/bkp32.stderr @@ -1,33 +1,33 @@ [ 1 of 11] Processing prelude-sig - [1 of 1] Compiling Prel[sig] ( prelude-sig/Prel.hsig, nothing ) + [1 of 1] Compiling Prel[sig] (.hsig -> nothing) [ 2 of 11] Processing arrays-sig - [1 of 2] Compiling Prel[sig] ( arrays-sig/Prel.hsig, nothing ) - [2 of 2] Compiling Array[sig] ( arrays-sig/Array.hsig, nothing ) + [1 of 2] Compiling Prel[sig] (.hsig -> nothing) + [2 of 2] Compiling Array[sig] (.hsig -> nothing) [ 3 of 11] Processing structures - [1 of 5] Compiling Prel[sig] ( structures/Prel.hsig, nothing ) - [2 of 5] Compiling Array[sig] ( structures/Array.hsig, nothing ) - [3 of 5] Compiling Graph ( structures/Graph.hs, nothing ) - [4 of 5] Compiling Tree ( structures/Tree.hs, nothing ) - [5 of 5] Compiling Set ( structures/Set.hs, nothing ) + [1 of 5] Compiling Prel[sig] (.hsig -> nothing) + [2 of 5] Compiling Array[sig] (.hsig -> nothing) + [3 of 5] Compiling Graph (.hs -> nothing) + [4 of 5] Compiling Tree (.hs -> nothing) + [5 of 5] Compiling Set (.hs -> nothing) [ 4 of 11] Processing arrays-a - [1 of 2] Compiling Prel[sig] ( arrays-a/Prel.hsig, nothing ) - [2 of 2] Compiling Array ( arrays-a/Array.hs, nothing ) + [1 of 2] Compiling Prel[sig] (.hsig -> nothing) + [2 of 2] Compiling Array (.hs -> nothing) [ 5 of 11] Processing arrays-b - [1 of 2] Compiling Prel[sig] ( arrays-b/Prel.hsig, nothing ) - [2 of 2] Compiling Array ( arrays-b/Array.hs, nothing ) + [1 of 2] Compiling Prel[sig] (.hsig -> nothing) + [2 of 2] Compiling Array (.hs -> nothing) [ 6 of 11] Processing graph-a - [1 of 1] Compiling Prel[sig] ( graph-a/Prel.hsig, nothing ) + [1 of 1] Compiling Prel[sig] (.hsig -> nothing) [ 7 of 11] Processing graph-b - [1 of 1] Compiling Prel[sig] ( graph-b/Prel.hsig, nothing ) + [1 of 1] Compiling Prel[sig] (.hsig -> nothing) [ 8 of 11] Processing multiinst - [1 of 2] Compiling Prel[sig] ( multiinst/Prel.hsig, nothing ) - [2 of 2] Compiling Client ( multiinst/Client.hs, nothing ) + [1 of 2] Compiling Prel[sig] (.hsig -> nothing) + [2 of 2] Compiling Client (.hs -> nothing) [ 9 of 11] Processing applic-left - [1 of 2] Compiling Prel[sig] ( applic-left/Prel.hsig, nothing ) - [2 of 2] Compiling Left ( applic-left/Left.hs, nothing ) + [1 of 2] Compiling Prel[sig] (.hsig -> nothing) + [2 of 2] Compiling Left (.hs -> nothing) [10 of 11] Processing applic-right - [1 of 2] Compiling Prel[sig] ( applic-right/Prel.hsig, nothing ) - [2 of 2] Compiling Right ( applic-right/Right.hs, nothing ) + [1 of 2] Compiling Prel[sig] (.hsig -> nothing) + [2 of 2] Compiling Right (.hs -> nothing) [11 of 11] Processing applic-bot - [1 of 2] Compiling Prel[sig] ( applic-bot/Prel.hsig, nothing ) - [2 of 2] Compiling Bot ( applic-bot/Bot.hs, nothing ) + [1 of 2] Compiling Prel[sig] (.hsig -> nothing) + [2 of 2] Compiling Bot (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp33.stderr b/testsuite/tests/backpack/should_compile/bkp33.stderr index 4fa8b755b0..238134701a 100644 --- a/testsuite/tests/backpack/should_compile/bkp33.stderr +++ b/testsuite/tests/backpack/should_compile/bkp33.stderr @@ -1,14 +1,14 @@ [1 of 3] Processing sig - [1 of 2] Compiling A[sig] ( sig/A.hsig, nothing ) - [2 of 2] Compiling M ( sig/M.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) [2 of 3] Processing mod Instantiating mod - [1 of 1] Compiling A ( mod/A.hs, bkp33.out/mod/A.o ) + [1 of 1] Compiling A (.hs -> .o) [3 of 3] Processing join Instantiating join [1 of 2] Including sig[A=mod:A] Instantiating sig[A=mod:A] - [1 of 2] Compiling A[sig] ( sig/A.hsig, bkp33.out/sig/sig-HyoWTHt34SDIRGEX0vZ8iN/A.o ) - [2 of 2] Compiling M ( sig/M.hs, bkp33.out/sig/sig-HyoWTHt34SDIRGEX0vZ8iN/M.o ) + [1 of 2] Compiling A[sig] (.hsig -> .o) + [2 of 2] Compiling M (.hs -> .o) [2 of 2] Including mod - [1 of 1] Compiling S ( join/S.hs, bkp33.out/join/S.o ) + [1 of 1] Compiling S (.hs -> .o) diff --git a/testsuite/tests/backpack/should_compile/bkp34.stderr b/testsuite/tests/backpack/should_compile/bkp34.stderr index 14aa7a843b..7285da98f7 100644 --- a/testsuite/tests/backpack/should_compile/bkp34.stderr +++ b/testsuite/tests/backpack/should_compile/bkp34.stderr @@ -1,7 +1,7 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling R ( r/R.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling R (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp35.stderr b/testsuite/tests/backpack/should_compile/bkp35.stderr index 14aa7a843b..7285da98f7 100644 --- a/testsuite/tests/backpack/should_compile/bkp35.stderr +++ b/testsuite/tests/backpack/should_compile/bkp35.stderr @@ -1,7 +1,7 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling R ( r/R.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling R (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp36.stderr b/testsuite/tests/backpack/should_compile/bkp36.stderr index 45ade1412f..f47646a727 100644 --- a/testsuite/tests/backpack/should_compile/bkp36.stderr +++ b/testsuite/tests/backpack/should_compile/bkp36.stderr @@ -1,9 +1,9 @@ [1 of 3] Processing f Instantiating f - [1 of 1] Compiling F ( f/F.hs, bkp36.out/f/F.o ) + [1 of 1] Compiling F (.hs -> .o) [2 of 3] Processing p - [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) - [2 of 2] Compiling P ( p/P.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling P (.hs -> nothing) [3 of 3] Processing q - [1 of 2] Compiling B[sig] ( q/B.hsig, nothing ) - [2 of 2] Compiling Q ( q/Q.hs, nothing ) + [1 of 2] Compiling B[sig] (.hsig -> nothing) + [2 of 2] Compiling Q (.hs -> nothing) diff --git a/testsuite/tests/backpack/should_compile/bkp37.stderr b/testsuite/tests/backpack/should_compile/bkp37.stderr index 90438e8c8a..01be99610e 100644 --- a/testsuite/tests/backpack/should_compile/bkp37.stderr +++ b/testsuite/tests/backpack/should_compile/bkp37.stderr @@ -1,10 +1,10 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q Instantiating q - [1 of 1] Compiling A ( q/A.hs, bkp37.out/q/A.o ) + [1 of 1] Compiling A (.hs -> .o) [3 of 3] Processing r Instantiating r [1 of 1] Including p[A=q:A] Instantiating p[A=q:A] - [1 of 1] Compiling A[sig] ( p/A.hsig, bkp37.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o ) + [1 of 1] Compiling A[sig] (.hsig -> .o) diff --git a/testsuite/tests/backpack/should_compile/bkp38.stderr b/testsuite/tests/backpack/should_compile/bkp38.stderr index bb9ef66c27..01be99610e 100644 --- a/testsuite/tests/backpack/should_compile/bkp38.stderr +++ b/testsuite/tests/backpack/should_compile/bkp38.stderr @@ -1,10 +1,10 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q Instantiating q - [1 of 1] Compiling A ( q/A.hs, bkp38.out/q/A.o ) + [1 of 1] Compiling A (.hs -> .o) [3 of 3] Processing r Instantiating r [1 of 1] Including p[A=q:A] Instantiating p[A=q:A] - [1 of 1] Compiling A[sig] ( p/A.hsig, bkp38.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o ) + [1 of 1] Compiling A[sig] (.hsig -> .o) diff --git a/testsuite/tests/backpack/should_compile/bkp39.stderr b/testsuite/tests/backpack/should_compile/bkp39.stderr index 924785c9da..1d44b9f436 100644 --- a/testsuite/tests/backpack/should_compile/bkp39.stderr +++ b/testsuite/tests/backpack/should_compile/bkp39.stderr @@ -1,12 +1,12 @@ [1 of 3] Processing p - [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) - [2 of 2] Compiling M ( p/M.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) [2 of 3] Processing q Instantiating q - [1 of 1] Compiling A ( q/A.hs, bkp39.out/q/A.o ) + [1 of 1] Compiling A (.hs -> .o) [3 of 3] Processing r Instantiating r [1 of 1] Including p[A=q:A] Instantiating p[A=q:A] - [1 of 2] Compiling A[sig] ( p/A.hsig, bkp39.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o ) - [2 of 2] Compiling M ( p/M.hs, bkp39.out/p/p-HVmFlcYSefiK5n1aDP1v7x/M.o ) + [1 of 2] Compiling A[sig] (.hsig -> .o) + [2 of 2] Compiling M (.hs -> .o) diff --git a/testsuite/tests/backpack/should_compile/bkp40.stderr b/testsuite/tests/backpack/should_compile/bkp40.stderr index 00176aabd2..238c362ce1 100644 --- a/testsuite/tests/backpack/should_compile/bkp40.stderr +++ b/testsuite/tests/backpack/should_compile/bkp40.stderr @@ -1,19 +1,19 @@ [1 of 4] Processing user - [1 of 2] Compiling Map[sig] ( user/Map.hsig, nothing ) - [2 of 2] Compiling User ( user/User.hs, nothing ) + [1 of 2] Compiling Map[sig] (.hsig -> nothing) + [2 of 2] Compiling User (.hs -> nothing) [2 of 4] Processing ordmap Instantiating ordmap - [1 of 1] Compiling Map ( ordmap/Map.hs, bkp40.out/ordmap/Map.o ) + [1 of 1] Compiling Map (.hs -> .o) [3 of 4] Processing eqmap Instantiating eqmap - [1 of 1] Compiling Map ( eqmap/Map.hs, bkp40.out/eqmap/Map.o ) + [1 of 1] Compiling Map (.hs -> .o) [4 of 4] Processing main Instantiating main [1 of 2] Including user[Map=ordmap:Map] Instantiating user[Map=ordmap:Map] - [1 of 2] Compiling Map[sig] ( user/Map.hsig, bkp40.out/user/user-GzloW2NeDdA2M0V8qzN4g2/Map.o ) - [2 of 2] Compiling User ( user/User.hs, bkp40.out/user/user-GzloW2NeDdA2M0V8qzN4g2/User.o ) + [1 of 2] Compiling Map[sig] (.hsig -> .o) + [2 of 2] Compiling User (.hs -> .o) [2 of 2] Including user[Map=eqmap:Map] Instantiating user[Map=eqmap:Map] - [1 of 2] Compiling Map[sig] ( user/Map.hsig, bkp40.out/user/user-9YyTxEeqz3GG5thfDXwuAf/Map.o ) - [2 of 2] Compiling User ( user/User.hs, bkp40.out/user/user-9YyTxEeqz3GG5thfDXwuAf/User.o ) + [1 of 2] Compiling Map[sig] (.hsig -> .o) + [2 of 2] Compiling User (.hs -> .o) diff --git a/testsuite/tests/backpack/should_fail/bkpfail01.stderr b/testsuite/tests/backpack/should_fail/bkpfail01.stderr index ae27f1988b..8bf94dbf93 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail01.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail01.stderr @@ -1,14 +1,14 @@ [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, nothing ) + [1 of 1] Compiling H (.hs -> nothing) [3 of 3] Processing r Instantiating r [1 of 1] Including p[H=q:H] Instantiating p[H=q:H] - [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) + [1 of 2] Compiling H[sig] (.hsig -> nothing) bkpfail01.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/../H.hi:1:1: error: ‘H’ is exported by the hsig file, but not exported the module ‘q:H’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail03.stderr b/testsuite/tests/backpack/should_fail/bkpfail03.stderr index 0b66c2da36..2c40e57d05 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail03.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail03.stderr @@ -1,15 +1,15 @@ [1 of 3] Processing q - [1 of 2] Compiling M1 ( q/M1.hs, nothing ) - [2 of 2] Compiling M2[sig] ( q/M2.hsig, nothing ) + [1 of 2] Compiling M1 (.hs -> nothing) + [2 of 2] Compiling M2[sig] (.hsig -> nothing) [2 of 3] Processing m2 Instantiating m2 - [1 of 1] Compiling M2 ( m2/M2.hs, nothing ) + [1 of 1] Compiling M2 (.hs -> nothing) [3 of 3] Processing p Instantiating p [1 of 1] Including q[M2=m2:M2] Instantiating q[M2=m2:M2] - [1 of 2] Compiling M1 ( q/M1.hs, nothing ) - [2 of 2] Compiling M2[sig] ( q/M2.hsig, nothing ) + [1 of 2] Compiling M1 (.hs -> nothing) + [2 of 2] Compiling M2[sig] (.hsig -> nothing) bkpfail03.bkp:3:9: error: The hsig file (re)exports ‘M1.M’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail04.stderr b/testsuite/tests/backpack/should_fail/bkpfail04.stderr index 48287cd650..c446289bd8 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail04.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail04.stderr @@ -1,9 +1,9 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) bkpfail04.bkp:7:9: error: Type constructor ‘A’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail05.stderr b/testsuite/tests/backpack/should_fail/bkpfail05.stderr index 25428e49f9..f2973a689f 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail05.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail05.stderr @@ -1,21 +1,21 @@ [1 of 5] Processing h - [1 of 1] Compiling H[sig] ( h/H.hsig, nothing ) + [1 of 1] Compiling H[sig] (.hsig -> nothing) [2 of 5] Processing t-impl Instantiating t-impl - [1 of 1] Compiling T ( t-impl/T.hs, bkpfail05.out/t-impl/T.o ) + [1 of 1] Compiling T (.hs -> .o) [3 of 5] Processing p - [1 of 1] Compiling H[sig] ( p/H.hsig, nothing ) + [1 of 1] Compiling H[sig] (.hsig -> nothing) [4 of 5] Processing h-impl Instantiating h-impl [1 of 1] Including t-impl - [1 of 1] Compiling H ( h-impl/H.hs, bkpfail05.out/h-impl/H.o ) + [1 of 1] Compiling H (.hs -> .o) [5 of 5] Processing q Instantiating q [1 of 1] Including p[H=h-impl:H] Instantiating p[H=h-impl:H] [1 of 2] Including h[H=h-impl:H] Instantiating h[H=h-impl:H] - [1 of 1] Compiling H[sig] ( h/H.hsig, bkpfail05.out/h/h-5FYQgnNkfSvBT5yogOxPpf/H.o ) + [1 of 1] Compiling H[sig] (.hsig -> .o) bkpfail05.out/h/h-5FYQgnNkfSvBT5yogOxPpf/../H.hi:1:1: error: ‘T1’ is exported by the hsig file, but not exported the module ‘h-impl:H’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail06.stderr b/testsuite/tests/backpack/should_fail/bkpfail06.stderr index 1fb5d5311f..e5d7e0400f 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail06.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail06.stderr @@ -1,15 +1,15 @@ [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 qimpl Instantiating qimpl - [1 of 2] Compiling T ( qimpl/T.hs, bkpfail06.out/qimpl/T.o ) - [2 of 2] Compiling H ( qimpl/H.hs, bkpfail06.out/qimpl/H.o ) + [1 of 2] Compiling T (.hs -> .o) + [2 of 2] Compiling H (.hs -> .o) [3 of 3] Processing q Instantiating q [1 of 1] Including p[H=qimpl:H] Instantiating p[H=qimpl:H] - [1 of 2] Compiling H[sig] ( p/H.hsig, bkpfail06.out/p/p-IueY0RdHDM2I4k0mLZuqM0/H.o ) + [1 of 2] Compiling H[sig] (.hsig -> .o) bkpfail06.bkp:10:9: error: Type constructor ‘qimpl:T.T’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail07.stderr b/testsuite/tests/backpack/should_fail/bkpfail07.stderr index 8a2c3876bb..a068451aa5 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail07.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail07.stderr @@ -1,11 +1,11 @@ [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 h - [1 of 3] Compiling T ( h/T.hs, nothing ) - [2 of 3] Compiling H ( h/H.hs, nothing ) - [3 of 3] Compiling A[sig] ( h/A.hsig, nothing ) + [1 of 3] Compiling T (.hs -> nothing) + [2 of 3] Compiling H (.hs -> nothing) + [3 of 3] Compiling A[sig] (.hsig -> nothing) [3 of 3] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) bkpfail07.bkp:6:9: error: • Type constructor ‘h[A=<A>]:T.T’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail09.stderr b/testsuite/tests/backpack/should_fail/bkpfail09.stderr index a767abc15e..0d78be6fd5 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail09.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail09.stderr @@ -1,9 +1,9 @@ [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, bkpfail09.out/q/H.o ) + [1 of 1] Compiling H (.hs -> .o) [3 of 3] Processing r Command line argument: -unit-id p[H=H]:0:0: error: diff --git a/testsuite/tests/backpack/should_fail/bkpfail10.stderr b/testsuite/tests/backpack/should_fail/bkpfail10.stderr index 248ef6356a..2fdf34928a 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail10.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail10.stderr @@ -1,13 +1,13 @@ [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 H ( q/H.hs, bkpfail10.out/q/H.o ) + [1 of 1] Compiling H (.hs -> .o) [3 of 3] Processing r Instantiating r [1 of 2] Including p[H=q:H] Instantiating p[H=q:H] - [1 of 1] Compiling H[sig] ( p/H.hsig, bkpfail10.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/H.o ) + [1 of 1] Compiling H[sig] (.hsig -> .o) bkpfail10.bkp:8:9: error: Type constructor ‘q:H.H’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail11.stderr b/testsuite/tests/backpack/should_fail/bkpfail11.stderr index 065a2e6ed4..4130907996 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail11.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail11.stderr @@ -1,14 +1,14 @@ [1 of 3] Processing sig - [1 of 2] Compiling A[sig] ( sig/A.hsig, nothing ) - [2 of 2] Compiling M ( sig/M.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) [2 of 3] Processing mod Instantiating mod - [1 of 1] Compiling A ( mod/A.hs, bkpfail11.out/mod/A.o ) + [1 of 1] Compiling A (.hs -> .o) [3 of 3] Processing join Instantiating join [1 of 1] Including sig[A=mod:A] Instantiating sig[A=mod:A] - [1 of 2] Compiling A[sig] ( sig/A.hsig, bkpfail11.out/sig/sig-HyoWTHt34SDIRGEX0vZ8iN/A.o ) + [1 of 2] Compiling A[sig] (.hsig -> .o) bkpfail11.out/sig/sig-HyoWTHt34SDIRGEX0vZ8iN/../A.hi:1:1: error: No instance for (GHC.Show.Show mod:A.X) diff --git a/testsuite/tests/backpack/should_fail/bkpfail12.stderr b/testsuite/tests/backpack/should_fail/bkpfail12.stderr index 224f23a86a..ec023868bc 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail12.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail12.stderr @@ -1,9 +1,9 @@ [1 of 3] Processing p - [1 of 2] Compiling Q[sig] ( p/Q.hsig, nothing ) - [2 of 2] Compiling P ( p/P.hs, nothing ) + [1 of 2] Compiling Q[sig] (.hsig -> nothing) + [2 of 2] Compiling P (.hs -> nothing) [2 of 3] Processing q Instantiating q - [1 of 1] Compiling Q ( q/Q.hs, bkpfail12.out/q/Q.o ) + [1 of 1] Compiling Q (.hs -> .o) [3 of 3] Processing r bkpfail12.bkp:8:9: error: diff --git a/testsuite/tests/backpack/should_fail/bkpfail13.stderr b/testsuite/tests/backpack/should_fail/bkpfail13.stderr index 34dbeb82c7..b7837b12f1 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail13.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail13.stderr @@ -1,9 +1,9 @@ [1 of 3] Processing p - [1 of 2] Compiling Q[sig] ( p/Q.hsig, nothing ) - [2 of 2] Compiling P ( p/P.hs, nothing ) + [1 of 2] Compiling Q[sig] (.hsig -> nothing) + [2 of 2] Compiling P (.hs -> nothing) [2 of 3] Processing q Instantiating q - [1 of 1] Compiling QMe ( q/QMe.hs, bkpfail13.out/q/QMe.o ) + [1 of 1] Compiling QMe (.hs -> .o) [3 of 3] Processing r bkpfail13.bkp:8:9: error: diff --git a/testsuite/tests/backpack/should_fail/bkpfail14.stderr b/testsuite/tests/backpack/should_fail/bkpfail14.stderr index bdccdee938..e72260c075 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail14.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail14.stderr @@ -1,12 +1,12 @@ [1 of 3] Processing p - [1 of 3] Compiling Q[sig] ( p/Q.hsig, nothing ) - [2 of 3] Compiling Q2[sig] ( p/Q2.hsig, nothing ) - [3 of 3] Compiling P ( p/P.hs, nothing ) + [1 of 3] Compiling Q[sig] (.hsig -> nothing) + [2 of 3] Compiling Q2[sig] (.hsig -> nothing) + [3 of 3] Compiling P (.hs -> nothing) [2 of 3] Processing q Instantiating q - [1 of 3] Compiling QMe ( q/QMe.hs, bkpfail14.out/q/QMe.o ) - [2 of 3] Compiling Q ( q/Q.hs, bkpfail14.out/q/Q.o ) - [3 of 3] Compiling Q2 ( q/Q2.hs, bkpfail14.out/q/Q2.o ) + [1 of 3] Compiling QMe (.hs -> .o) + [2 of 3] Compiling Q (.hs -> .o) + [3 of 3] Compiling Q2 (.hs -> .o) [3 of 3] Processing r bkpfail14.bkp:9:9: error: diff --git a/testsuite/tests/backpack/should_fail/bkpfail15.stderr b/testsuite/tests/backpack/should_fail/bkpfail15.stderr index 37d0f5d3a4..3146c53b65 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail15.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail15.stderr @@ -1,12 +1,12 @@ [1 of 3] Processing p - [1 of 3] Compiling A[sig] ( p/A.hsig, nothing ) - [2 of 3] Compiling Q[sig] ( p/Q.hsig, nothing ) - [3 of 3] Compiling P ( p/P.hs, nothing ) + [1 of 3] Compiling A[sig] (.hsig -> nothing) + [2 of 3] Compiling Q[sig] (.hsig -> nothing) + [3 of 3] Compiling P (.hs -> nothing) [2 of 3] Processing q Instantiating q - [1 of 1] Compiling Q ( q/Q.hs, bkpfail15.out/q/Q.o ) + [1 of 1] Compiling Q (.hs -> .o) [3 of 3] Processing r - [1 of 1] Compiling A[sig] ( r/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) bkpfail15.bkp:8:9: error: • Identifier ‘q:Q.f’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail16.stderr b/testsuite/tests/backpack/should_fail/bkpfail16.stderr index a92352c26d..b0086bfa52 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail16.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail16.stderr @@ -1,10 +1,10 @@ [1 of 2] Processing p - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) + [1 of 1] Compiling ShouldFail[sig] (.hsig -> nothing) [2 of 2] Processing q Instantiating q [1 of 1] Including p[ShouldFail=base-4.9.0.0:Data.Bool] Instantiating p[ShouldFail=base-4.9.0.0:Data.Bool] - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/ShouldFail.o ) + [1 of 1] Compiling ShouldFail[sig] (.hsig -> .o) bkpfail16.out/p/p-1OqLaT7dAn947wScQQKCw5/../ShouldFail.hi:1:1: error: ‘Booly’ is exported by the hsig file, but not exported the module ‘Data.Bool’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail17.stderr b/testsuite/tests/backpack/should_fail/bkpfail17.stderr index 99cecef7dc..52e0a0665a 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail17.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail17.stderr @@ -1,10 +1,10 @@ [1 of 2] Processing p - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) + [1 of 1] Compiling ShouldFail[sig] (.hsig -> nothing) [2 of 2] Processing q Instantiating q [1 of 1] Including p[ShouldFail=base-4.9.0.0:Prelude] Instantiating p[ShouldFail=base-4.9.0.0:Prelude] - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail17.out/p/p-2W6J7O3LvroH97zGxbPEGF/ShouldFail.o ) + [1 of 1] Compiling ShouldFail[sig] (.hsig -> .o) <no location info>: error: Type constructor ‘Data.Either.Either’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail18.stderr b/testsuite/tests/backpack/should_fail/bkpfail18.stderr index ac66507f8c..c50880e4e7 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail18.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail18.stderr @@ -1,5 +1,5 @@ [1 of 1] Processing p - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) + [1 of 1] Compiling ShouldFail[sig] (.hsig -> nothing) bkpfail18.bkp:3:18: error: Duplicate instance declarations: diff --git a/testsuite/tests/backpack/should_fail/bkpfail19.stderr b/testsuite/tests/backpack/should_fail/bkpfail19.stderr index 73f358c8cb..91dea5553f 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail19.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail19.stderr @@ -1,10 +1,10 @@ [1 of 2] Processing p - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, nothing ) + [1 of 1] Compiling ShouldFail[sig] (.hsig -> nothing) [2 of 2] Processing q Instantiating q [1 of 1] Including p[ShouldFail=base-4.9.0.0:Data.STRef] Instantiating p[ShouldFail=base-4.9.0.0:Data.STRef] - [1 of 1] Compiling ShouldFail[sig] ( p/ShouldFail.hsig, bkpfail19.out/p/p-CfyUIAu1JTRCDuXEyGszXN/ShouldFail.o ) + [1 of 1] Compiling ShouldFail[sig] (.hsig -> .o) <no location info>: error: The hsig file (re)exports ‘Data.STRef.Lazy.newSTRef’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail20.stderr b/testsuite/tests/backpack/should_fail/bkpfail20.stderr index df010b9018..56b062879f 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail20.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail20.stderr @@ -1,9 +1,9 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [3 of 3] Processing r - [1 of 1] Compiling B[sig] ( r/B.hsig, nothing ) + [1 of 1] Compiling B[sig] (.hsig -> nothing) bkpfail20.bkp:1:1: error: While merging export lists, could not unify Data.STRef.Lazy.newSTRef with GHC.STRef.newSTRef diff --git a/testsuite/tests/backpack/should_fail/bkpfail21.stderr b/testsuite/tests/backpack/should_fail/bkpfail21.stderr index 258bf71e96..4384e3636e 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail21.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail21.stderr @@ -1,13 +1,13 @@ [1 of 3] Processing p - [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) - [2 of 2] Compiling C[sig] ( p/C.hsig, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling C[sig] (.hsig -> nothing) [2 of 3] Processing q - [1 of 2] Compiling B[sig] ( q/B.hsig, nothing ) - [2 of 2] Compiling C[sig] ( q/C.hsig, nothing ) + [1 of 2] Compiling B[sig] (.hsig -> nothing) + [2 of 2] Compiling C[sig] (.hsig -> nothing) [3 of 3] Processing r - [1 of 3] Compiling H2[sig] ( r/H2.hsig, nothing ) - [2 of 3] Compiling H1[sig] ( r/H1.hsig, nothing ) - [3 of 3] Compiling H3[sig] ( r/H3.hsig, nothing ) + [1 of 3] Compiling H2[sig] (.hsig -> nothing) + [2 of 3] Compiling H1[sig] (.hsig -> nothing) + [3 of 3] Compiling H3[sig] (.hsig -> nothing) bkpfail21.bkp:1:1: error: While merging export lists, could not unify {H1.T} with {H2.T} diff --git a/testsuite/tests/backpack/should_fail/bkpfail22.stderr b/testsuite/tests/backpack/should_fail/bkpfail22.stderr index 522985db39..b649a6760f 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail22.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail22.stderr @@ -1,17 +1,17 @@ [1 of 4] Processing p - [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) - [2 of 2] Compiling M ( p/M.hs, nothing ) + [1 of 2] Compiling H[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) [2 of 4] Processing q - [1 of 2] Compiling H2[sig] ( q/H2.hsig, nothing ) - [2 of 2] Compiling N ( q/N.hs, nothing ) + [1 of 2] Compiling H2[sig] (.hsig -> nothing) + [2 of 2] Compiling N (.hs -> nothing) [3 of 4] Processing badimpl Instantiating badimpl - [1 of 1] Compiling H2 ( badimpl/H2.hs, bkpfail22.out/badimpl/H2.o ) + [1 of 1] Compiling H2 (.hs -> .o) [4 of 4] Processing check Instantiating check [1 of 2] Including q[H2=badimpl:H2] Instantiating q[H2=badimpl:H2] - [1 of 2] Compiling H2[sig] ( q/H2.hsig, bkpfail22.out/q/q-FjwGsuDQ5qiKUCvnEATUA9/H2.o ) + [1 of 2] Compiling H2[sig] (.hsig -> .o) bkpfail22.bkp:16:9: error: Type constructor ‘badimpl:H2.S’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail23.stderr b/testsuite/tests/backpack/should_fail/bkpfail23.stderr index ac5fd06388..1ebc413e0a 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail23.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail23.stderr @@ -1,14 +1,14 @@ [1 of 3] Processing p - [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) - [2 of 2] Compiling M ( p/M.hs, nothing ) + [1 of 2] Compiling H[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) [2 of 3] Processing h Instantiating h - [1 of 1] Compiling H ( h/H.hs, bkpfail23.out/h/H.o ) + [1 of 1] Compiling H (.hs -> .o) [3 of 3] Processing r Instantiating r [1 of 1] Including p[H=h:H] Instantiating p[H=h:H] - [1 of 2] Compiling H[sig] ( p/H.hsig, bkpfail23.out/p/p-6KeuBvYi0jvLWqVbkSAZMq/H.o ) + [1 of 2] Compiling H[sig] (.hsig -> .o) bkpfail23.bkp:14:9: error: Type constructor ‘h:H.F’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail24.stderr b/testsuite/tests/backpack/should_fail/bkpfail24.stderr index 53312d23fe..17a3d170f6 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail24.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail24.stderr @@ -1,7 +1,7 @@ [1 of 1] Processing p - [1 of 3] Compiling H1[sig] ( p/H1.hsig, nothing ) - [2 of 3] Compiling H2[sig] ( p/H2.hsig, nothing ) - [3 of 3] Compiling M ( p/M.hs, nothing ) + [1 of 3] Compiling H1[sig] (.hsig -> nothing) + [2 of 3] Compiling H2[sig] (.hsig -> nothing) + [3 of 3] Compiling M (.hs -> nothing) bkpfail24.bkp:14:15: error: • Could not deduce: a ~ b diff --git a/testsuite/tests/backpack/should_fail/bkpfail25.stderr b/testsuite/tests/backpack/should_fail/bkpfail25.stderr index 1440948544..6752e9d54a 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail25.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail25.stderr @@ -1,6 +1,6 @@ [1 of 3] Processing p - [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) - [2 of 2] Compiling M ( p/M.hs, nothing ) + [1 of 2] Compiling H[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) bkpfail25.bkp:7:18: warning: [-Wmissing-methods (in -Wdefault)] • No explicit implementation for @@ -8,12 +8,12 @@ bkpfail25.bkp:7:18: warning: [-Wmissing-methods (in -Wdefault)] • In the instance declaration for ‘Functor T’ [2 of 3] Processing q Instantiating q - [1 of 1] Compiling H ( q/H.hs, bkpfail25.out/q/H.o ) + [1 of 1] Compiling H (.hs -> .o) [3 of 3] Processing r Instantiating r [1 of 1] Including p[H=q:H] Instantiating p[H=q:H] - [1 of 2] Compiling H[sig] ( p/H.hsig, bkpfail25.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/H.o ) + [1 of 2] Compiling H[sig] (.hsig -> .o) bkpfail25.bkp:12:9: error: Type constructor ‘q:H.T’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail26.stderr b/testsuite/tests/backpack/should_fail/bkpfail26.stderr index 4c49bd1e0e..57327fc067 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail26.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail26.stderr @@ -1,14 +1,14 @@ [1 of 3] Processing p - [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) - [2 of 2] Compiling M ( p/M.hs, nothing ) + [1 of 2] Compiling H[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) [2 of 3] Processing q Instantiating q - [1 of 1] Compiling H ( q/H.hs, bkpfail26.out/q/H.o ) + [1 of 1] Compiling H (.hs -> .o) [3 of 3] Processing r Instantiating r [1 of 1] Including p[H=q:H] Instantiating p[H=q:H] - [1 of 2] Compiling H[sig] ( p/H.hsig, bkpfail26.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/H.o ) + [1 of 2] Compiling H[sig] (.hsig -> .o) bkpfail26.bkp:15:9: error: Type constructor ‘q:H.T’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail27.stderr b/testsuite/tests/backpack/should_fail/bkpfail27.stderr index b24587a2af..90e1a86b1b 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail27.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail27.stderr @@ -1,14 +1,14 @@ [1 of 3] Processing p - [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) - [2 of 2] Compiling M ( p/M.hs, nothing ) + [1 of 2] Compiling H[sig] (.hsig -> nothing) + [2 of 2] Compiling M (.hs -> nothing) [2 of 3] Processing q Instantiating q - [1 of 1] Compiling H ( q/H.hs, bkpfail27.out/q/H.o ) + [1 of 1] Compiling H (.hs -> .o) [3 of 3] Processing r Instantiating r [1 of 1] Including p[H=q:H] Instantiating p[H=q:H] - [1 of 2] Compiling H[sig] ( p/H.hsig, bkpfail27.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/H.o ) + [1 of 2] Compiling H[sig] (.hsig -> .o) bkpfail27.bkp:15:9: error: Type constructor ‘q:H.T’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail28.stderr b/testsuite/tests/backpack/should_fail/bkpfail28.stderr index 4428da9a41..1ec0e64648 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail28.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail28.stderr @@ -1,10 +1,10 @@ [1 of 3] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [2 of 3] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 1] Compiling A[sig] (.hsig -> nothing) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling R ( r/R.hs, nothing ) + [1 of 2] Compiling A[sig] (.hsig -> nothing) + [2 of 2] Compiling R (.hs -> nothing) bkpfail28.bkp:18:13: error: • Overlapping instances for Show (K a) arising from a use of ‘show’ diff --git a/testsuite/tests/cabal/cabal08/cabal08.stdout b/testsuite/tests/cabal/cabal08/cabal08.stdout index 8f97cd409f..aed423f657 100644 --- a/testsuite/tests/cabal/cabal08/cabal08.stdout +++ b/testsuite/tests/cabal/cabal08/cabal08.stdout @@ -1,6 +1,6 @@ -[1 of 1] Compiling Main ( Main.hs, Main.o ) +[1 of 1] Compiling Main (.hs -> .o) Linking Main ... p2 -[1 of 1] Compiling Main ( Main.hs, Main.o ) +[1 of 1] Compiling Main (.hs -> .o) Linking Main ... p2 diff --git a/testsuite/tests/deriving/should_fail/T9071.stderr b/testsuite/tests/deriving/should_fail/T9071.stderr index c2dccbd28f..fd43752656 100644 --- a/testsuite/tests/deriving/should_fail/T9071.stderr +++ b/testsuite/tests/deriving/should_fail/T9071.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling T9071a ( T9071a.hs, T9071a.o ) -[2 of 2] Compiling T9071 ( T9071.hs, T9071.o ) +[1 of 2] Compiling T9071a (.hs -> .o) +[2 of 2] Compiling T9071 (.hs -> .o) T9071.hs:7:37: error: Couldn't match kind ‘* -> *’ with ‘*’ diff --git a/testsuite/tests/determinism/determ002/determ002.stdout b/testsuite/tests/determinism/determ002/determ002.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ002/determ002.stdout +++ b/testsuite/tests/determinism/determ002/determ002.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ003/determ003.stdout b/testsuite/tests/determinism/determ003/determ003.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ003/determ003.stdout +++ b/testsuite/tests/determinism/determ003/determ003.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ005/determ005.stdout b/testsuite/tests/determinism/determ005/determ005.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ005/determ005.stdout +++ b/testsuite/tests/determinism/determ005/determ005.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ006/determ006.stdout b/testsuite/tests/determinism/determ006/determ006.stdout index 138d4023c5..e5c7e03c2c 100644 --- a/testsuite/tests/determinism/determ006/determ006.stdout +++ b/testsuite/tests/determinism/determ006/determ006.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling Roman ( spec-inline-determ.hs, spec-inline-determ.o ) -[1 of 1] Compiling Roman ( spec-inline-determ.hs, spec-inline-determ.o ) +[1 of 1] Compiling Roman (.hs -> .o) +[1 of 1] Compiling Roman (.hs -> .o) diff --git a/testsuite/tests/determinism/determ007/determ007.stdout b/testsuite/tests/determinism/determ007/determ007.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ007/determ007.stdout +++ b/testsuite/tests/determinism/determ007/determ007.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ008/determ008.stdout b/testsuite/tests/determinism/determ008/determ008.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ008/determ008.stdout +++ b/testsuite/tests/determinism/determ008/determ008.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ009/determ009.stdout b/testsuite/tests/determinism/determ009/determ009.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ009/determ009.stdout +++ b/testsuite/tests/determinism/determ009/determ009.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ010/determ010.stdout b/testsuite/tests/determinism/determ010/determ010.stdout index 9a2bb829d5..3d20d55bc8 100644 --- a/testsuite/tests/determinism/determ010/determ010.stdout +++ b/testsuite/tests/determinism/determ010/determ010.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling ShouldCompile ( A.hs, A.o ) -[1 of 1] Compiling ShouldCompile ( A.hs, A.o ) +[1 of 1] Compiling ShouldCompile (.hs -> .o) +[1 of 1] Compiling ShouldCompile (.hs -> .o) diff --git a/testsuite/tests/determinism/determ011/determ011.stdout b/testsuite/tests/determinism/determ011/determ011.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ011/determ011.stdout +++ b/testsuite/tests/determinism/determ011/determ011.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ012/determ012.stdout b/testsuite/tests/determinism/determ012/determ012.stdout index 713550b6a3..946a56efad 100644 --- a/testsuite/tests/determinism/determ012/determ012.stdout +++ b/testsuite/tests/determinism/determ012/determ012.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling T10109 ( A.hs, A.o ) -[1 of 1] Compiling T10109 ( A.hs, A.o ) +[1 of 1] Compiling T10109 (.hs -> .o) +[1 of 1] Compiling T10109 (.hs -> .o) diff --git a/testsuite/tests/determinism/determ013/determ013.stdout b/testsuite/tests/determinism/determ013/determ013.stdout index 103261b5bc..e288ce548b 100644 --- a/testsuite/tests/determinism/determ013/determ013.stdout +++ b/testsuite/tests/determinism/determ013/determ013.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling T9063 ( A.hs, A.o ) -[1 of 1] Compiling T9063 ( A.hs, A.o ) +[1 of 1] Compiling T9063 (.hs -> .o) +[1 of 1] Compiling T9063 (.hs -> .o) diff --git a/testsuite/tests/determinism/determ014/determ014.stdout b/testsuite/tests/determinism/determ014/determ014.stdout index 2607792b31..61f89b6f40 100644 --- a/testsuite/tests/determinism/determ014/determ014.stdout +++ b/testsuite/tests/determinism/determ014/determ014.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling KeyValue ( A.hs, A.o ) -[1 of 1] Compiling KeyValue ( A.hs, A.o ) +[1 of 1] Compiling KeyValue (.hs -> .o) +[1 of 1] Compiling KeyValue (.hs -> .o) diff --git a/testsuite/tests/determinism/determ015/determ015.stdout b/testsuite/tests/determinism/determ015/determ015.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ015/determ015.stdout +++ b/testsuite/tests/determinism/determ015/determ015.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ016/determ016.stdout b/testsuite/tests/determinism/determ016/determ016.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ016/determ016.stdout +++ b/testsuite/tests/determinism/determ016/determ016.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ017/determ017.stdout b/testsuite/tests/determinism/determ017/determ017.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ017/determ017.stdout +++ b/testsuite/tests/determinism/determ017/determ017.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ018/determ018.stdout b/testsuite/tests/determinism/determ018/determ018.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ018/determ018.stdout +++ b/testsuite/tests/determinism/determ018/determ018.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ019/determ019.stdout b/testsuite/tests/determinism/determ019/determ019.stdout index 60c2bc368d..22768dddae 100644 --- a/testsuite/tests/determinism/determ019/determ019.stdout +++ b/testsuite/tests/determinism/determ019/determ019.stdout @@ -1,2 +1,2 @@ -[1 of 1] Compiling A ( A.hs, A.o ) -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) +[1 of 1] Compiling A (.hs -> .o) diff --git a/testsuite/tests/determinism/determ021/determ021.stdout b/testsuite/tests/determinism/determ021/determ021.stdout index 747064f2c6..d85ff6e294 100644 --- a/testsuite/tests/determinism/determ021/determ021.stdout +++ b/testsuite/tests/determinism/determ021/determ021.stdout @@ -1,4 +1,4 @@ -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) TYPE SIGNATURES test2 :: forall t b (f :: * -> *). @@ -9,7 +9,7 @@ COERCION AXIOMS Dependent modules: [] Dependent packages: [base-4.9.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.1] -[1 of 1] Compiling A ( A.hs, A.o ) +[1 of 1] Compiling A (.hs -> .o) TYPE SIGNATURES test2 :: forall t b (f :: * -> *). diff --git a/testsuite/tests/driver/T437/T437.stdout b/testsuite/tests/driver/T437/T437.stdout index 7508a5f9e0..7490c96635 100644 --- a/testsuite/tests/driver/T437/T437.stdout +++ b/testsuite/tests/driver/T437/T437.stdout @@ -1,10 +1,10 @@ -[1 of 2] Compiling Test2 ( Test2.hs, Test2.o ) -[2 of 2] Compiling Test ( Test.hs, Test.o ) +[1 of 2] Compiling Test2 (.hs -> .o) +[2 of 2] Compiling Test (.hs -> .o) Linking Test ... -[1 of 1] Compiling Test2 ( Test2.hs, Test2.o ) [flags changed] +[1 of 1] Compiling Test2 (.hs -> .o) [flags changed] Linking Test2 ... "Test2.doit" "Test2.main" -[1 of 1] Compiling Test2 ( Test2.hs, Test2.o ) [flags changed] +[1 of 1] Compiling Test2 (.hs -> .o) [flags changed] Linking Test2 ... "Test2.doit" diff --git a/testsuite/tests/driver/T8526/T8526.stdout b/testsuite/tests/driver/T8526/T8526.stdout index 3b24506774..bbe21c0f36 100644 --- a/testsuite/tests/driver/T8526/T8526.stdout +++ b/testsuite/tests/driver/T8526/T8526.stdout @@ -1,6 +1,6 @@ -[1 of 1] Compiling A ( A.hs, interpreted ) +[1 of 1] Compiling A (.hs -> interpreted) Ok, modules loaded: A. True -[1 of 1] Compiling A ( A.hs, interpreted ) +[1 of 1] Compiling A (.hs -> interpreted) Ok, modules loaded: A. False diff --git a/testsuite/tests/driver/recomp002/recomp002.stdout b/testsuite/tests/driver/recomp002/recomp002.stdout index d9ddb2523a..db014ffc8a 100644 --- a/testsuite/tests/driver/recomp002/recomp002.stdout +++ b/testsuite/tests/driver/recomp002/recomp002.stdout @@ -1,3 +1,3 @@ -[1 of 3] Compiling W[boot] ( W.hs-boot, W.o-boot ) -[2 of 3] Compiling Q ( Q.hs, Q.o ) -[3 of 3] Compiling W ( W.hs, W.o ) +[1 of 3] Compiling W[boot] (.hs-boot -> .o-boot) +[2 of 3] Compiling Q (.hs -> .o) +[3 of 3] Compiling W (.hs -> .o) diff --git a/testsuite/tests/driver/recomp005/recomp005.stdout b/testsuite/tests/driver/recomp005/recomp005.stdout index 6e2581ed04..e5b49a7ff2 100644 --- a/testsuite/tests/driver/recomp005/recomp005.stdout +++ b/testsuite/tests/driver/recomp005/recomp005.stdout @@ -1,8 +1,8 @@ -[1 of 5] Compiling A ( A.hs, A.o ) -[2 of 5] Compiling B ( B.hs, B.o ) -[3 of 5] Compiling C ( C.hs, C.o ) -[4 of 5] Compiling D ( D.hs, D.o ) -[5 of 5] Compiling E ( E.hs, E.o ) -[3 of 5] Compiling C ( C.hs, C.o ) -[4 of 5] Compiling D ( D.hs, D.o ) [C changed] -[5 of 5] Compiling E ( E.hs, E.o ) [D changed] +[1 of 5] Compiling A (.hs -> .o) +[2 of 5] Compiling B (.hs -> .o) +[3 of 5] Compiling C (.hs -> .o) +[4 of 5] Compiling D (.hs -> .o) +[5 of 5] Compiling E (.hs -> .o) +[3 of 5] Compiling C (.hs -> .o) +[4 of 5] Compiling D (.hs -> .o) [C changed] +[5 of 5] Compiling E (.hs -> .o) [D changed] diff --git a/testsuite/tests/driver/recomp006/recomp006.stdout b/testsuite/tests/driver/recomp006/recomp006.stdout index 499b06f08b..0319ceb9da 100644 --- a/testsuite/tests/driver/recomp006/recomp006.stdout +++ b/testsuite/tests/driver/recomp006/recomp006.stdout @@ -1,2 +1,2 @@ -[1 of 2] Compiling B ( B.hs, B.o ) -[2 of 2] Compiling A ( A.hs, A.o ) [B changed] +[1 of 2] Compiling B (.hs -> .o) +[2 of 2] Compiling A (.hs -> .o) [B changed] diff --git a/testsuite/tests/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout index 6230acfb02..347036a9ec 100644 --- a/testsuite/tests/driver/recomp007/recomp007.stdout +++ b/testsuite/tests/driver/recomp007/recomp007.stdout @@ -1,4 +1,4 @@ Preprocessing executable 'test' for b-1.0... -[1 of 2] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) [A changed] -[2 of 2] Compiling Main ( Main.hs, dist/build/test/test-tmp/Main.o ) [B changed] +[1 of 2] Compiling B (.hs -> .o) [A changed] +[2 of 2] Compiling Main (.hs -> .o) [B changed] Linking dist/build/test/test ... diff --git a/testsuite/tests/driver/recomp011/recomp011.stdout b/testsuite/tests/driver/recomp011/recomp011.stdout index d3e0b92508..af92f9392f 100644 --- a/testsuite/tests/driver/recomp011/recomp011.stdout +++ b/testsuite/tests/driver/recomp011/recomp011.stdout @@ -1,10 +1,10 @@ -[1 of 1] Compiling Main ( Main.hs, Main.o ) +[1 of 1] Compiling Main (.hs -> .o) Linking Main ... 42 -[1 of 1] Compiling Main ( Main.hs, Main.o ) [B.hsinc changed] +[1 of 1] Compiling Main (.hs -> .o) [B.hsinc changed] Linking Main ... 43 -[1 of 1] Compiling Main ( Main.hs, Main.o ) [A.hsinc changed] +[1 of 1] Compiling Main (.hs -> .o) [A.hsinc changed] Linking Main ... 4343 4343 diff --git a/testsuite/tests/driver/recomp013/recomp013.stdout b/testsuite/tests/driver/recomp013/recomp013.stdout index 0a5aef7356..1aedd741ab 100644 --- a/testsuite/tests/driver/recomp013/recomp013.stdout +++ b/testsuite/tests/driver/recomp013/recomp013.stdout @@ -1,7 +1,7 @@ first run -[1 of 3] Compiling A ( A.hs, A.o ) -[2 of 3] Compiling B ( B.hs, B.o ) -[3 of 3] Compiling C ( C.hs, C.o ) +[1 of 3] Compiling A (.hs -> .o) +[2 of 3] Compiling B (.hs -> .o) +[3 of 3] Compiling C (.hs -> .o) second run -[2 of 3] Compiling B ( B.hs, B.o ) -[3 of 3] Compiling C ( C.hs, C.o ) [B changed] +[2 of 3] Compiling B (.hs -> .o) +[3 of 3] Compiling C (.hs -> .o) [B changed] diff --git a/testsuite/tests/driver/recomp015/recomp015.stdout b/testsuite/tests/driver/recomp015/recomp015.stdout index a7dbad203a..c0eff3a3b6 100644 --- a/testsuite/tests/driver/recomp015/recomp015.stdout +++ b/testsuite/tests/driver/recomp015/recomp015.stdout @@ -1,6 +1,6 @@ -[1 of 1] Compiling Main ( Generate.hs, Generate.o ) +[1 of 1] Compiling Main (.hs -> .o) Linking Generate ... -[1 of 1] Compiling Main ( Main.hs, Main.o ) +[1 of 1] Compiling Main (.hs -> .o) Linking Main ... Running main... Running main... diff --git a/testsuite/tests/driver/recomp016/recomp016.stdout b/testsuite/tests/driver/recomp016/recomp016.stdout index eb6c6fce42..2ae49d346a 100644 --- a/testsuite/tests/driver/recomp016/recomp016.stdout +++ b/testsuite/tests/driver/recomp016/recomp016.stdout @@ -1,12 +1,12 @@ first run -[1 of 5] Compiling A ( A.hs, A.o ) -[2 of 5] Compiling B ( B.hs, B.o ) -[3 of 5] Compiling C ( C.hs, C.o ) -[4 of 5] Compiling D ( D.hs, D.o ) -[5 of 5] Compiling E ( E.hs, E.o ) +[1 of 5] Compiling A (.hs -> .o) +[2 of 5] Compiling B (.hs -> .o) +[3 of 5] Compiling C (.hs -> .o) +[4 of 5] Compiling D (.hs -> .o) +[5 of 5] Compiling E (.hs -> .o) second run -[1 of 5] Compiling A2 ( A2.hs, A2.o ) -[2 of 5] Compiling B ( B.hs, B.o ) -[3 of 5] Compiling C ( C.hs, C.o ) [B changed] -[4 of 5] Compiling D ( D.hs, D.o ) [C changed] -[5 of 5] Compiling E ( E.hs, E.o ) [B changed] +[1 of 5] Compiling A2 (.hs -> .o) +[2 of 5] Compiling B (.hs -> .o) +[3 of 5] Compiling C (.hs -> .o) [B changed] +[4 of 5] Compiling D (.hs -> .o) [C changed] +[5 of 5] Compiling E (.hs -> .o) [B changed] diff --git a/testsuite/tests/driver/retc001/retc001.stdout b/testsuite/tests/driver/retc001/retc001.stdout index 381850d9a4..65d93d8244 100644 --- a/testsuite/tests/driver/retc001/retc001.stdout +++ b/testsuite/tests/driver/retc001/retc001.stdout @@ -1,7 +1,7 @@ -[1 of 3] Compiling A ( A.hs, nothing ) -[2 of 3] Compiling B ( B.hs, nothing ) -[3 of 3] Compiling Main ( C.hs, nothing ) +[1 of 3] Compiling A (.hs -> nothing) +[2 of 3] Compiling B (.hs -> nothing) +[3 of 3] Compiling Main (.hs -> nothing) Middle End -[2 of 3] Compiling B ( B.hs, nothing ) -[3 of 3] Compiling Main ( C.hs, nothing ) [B changed] +[2 of 3] Compiling B (.hs -> nothing) +[3 of 3] Compiling Main (.hs -> nothing) [B changed] diff --git a/testsuite/tests/driver/retc002/retc002.stdout b/testsuite/tests/driver/retc002/retc002.stdout index e76853f8f8..3eed320b17 100644 --- a/testsuite/tests/driver/retc002/retc002.stdout +++ b/testsuite/tests/driver/retc002/retc002.stdout @@ -1,3 +1,3 @@ -[1 of 3] Compiling W[boot] ( W.hs-boot, nothing ) -[2 of 3] Compiling Q ( Q.hs, nothing ) -[3 of 3] Compiling W ( W.hs, nothing ) +[1 of 3] Compiling W[boot] (.hs-boot -> nothing) +[2 of 3] Compiling Q (.hs -> nothing) +[3 of 3] Compiling W (.hs -> nothing) diff --git a/testsuite/tests/driver/write_interface_make.stdout b/testsuite/tests/driver/write_interface_make.stdout index 1594f5ee2f..9111e605a2 100644 --- a/testsuite/tests/driver/write_interface_make.stdout +++ b/testsuite/tests/driver/write_interface_make.stdout @@ -1 +1 @@ -[1 of 1] Compiling A011 ( A011.hs, nothing ) +[1 of 1] Compiling A011 (.hs -> nothing) diff --git a/testsuite/tests/generics/T5462No1.stderr b/testsuite/tests/generics/T5462No1.stderr index c82f1b86ee..91e078b33e 100644 --- a/testsuite/tests/generics/T5462No1.stderr +++ b/testsuite/tests/generics/T5462No1.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling GFunctor ( GFunctor/GFunctor.hs, out_T5462No1/GFunctor.o ) -[2 of 2] Compiling T5462No1 ( T5462No1.hs, out_T5462No1/T5462No1.o ) +[1 of 2] Compiling GFunctor (.hs -> .o) +[2 of 2] Compiling T5462No1 (.hs -> .o) T5462No1.hs:24:42: error: Can't make a derived instance of ‘GFunctor F’: diff --git a/testsuite/tests/ghc-api/T10052/T10052.stdout b/testsuite/tests/ghc-api/T10052/T10052.stdout index 1a909eb36f..ad610bd173 100644 --- a/testsuite/tests/ghc-api/T10052/T10052.stdout +++ b/testsuite/tests/ghc-api/T10052/T10052.stdout @@ -1 +1 @@ -[1 of 1] Compiling Main ( T10052-input.hs, interpreted ) +[1 of 1] Compiling Main (.hs -> interpreted) diff --git a/testsuite/tests/ghc-api/T7478/T7478.stdout b/testsuite/tests/ghc-api/T7478/T7478.stdout index 372cf9bfa3..f12c4f6ce1 100644 --- a/testsuite/tests/ghc-api/T7478/T7478.stdout +++ b/testsuite/tests/ghc-api/T7478/T7478.stdout @@ -1,8 +1,8 @@ ----- 0 ------ -(0,"[1 of 2] Compiling B ( B.hs, B.o )") -(0,"[2 of 2] Compiling Main ( A.hs, A.o )") +(0,"[1 of 2] Compiling B (.hs -> .o)") +(0,"[2 of 2] Compiling Main (.hs -> .o)") ----- 1 ------ -(1,"[2 of 2] Compiling Main ( A.hs, A.o )") +(1,"[2 of 2] Compiling Main (.hs -> .o)") ----- 2 ------ -(2,"[1 of 1] Compiling Main ( C.hs, C.o )") +(2,"[1 of 1] Compiling Main (.hs -> .o)") (2,"Linking A ...") diff --git a/testsuite/tests/ghci/prog009/ghci.prog009.stdout b/testsuite/tests/ghci/prog009/ghci.prog009.stdout index 20c759782f..fd6fa93e60 100644 --- a/testsuite/tests/ghci/prog009/ghci.prog009.stdout +++ b/testsuite/tests/ghci/prog009/ghci.prog009.stdout @@ -3,6 +3,6 @@ nub :: Eq a => [a] -> [a] nub :: Eq a => [a] -> [a] "tan" nub :: Eq a => [a] -> [a] -A ( A.hs, interpreted ) +A (.hs -> interpreted) nub :: Eq a => [a] -> [a] "tan" diff --git a/testsuite/tests/ghci/scripts/T1914.stdout b/testsuite/tests/ghci/scripts/T1914.stdout index 063758e39c..2d57c38424 100644 --- a/testsuite/tests/ghci/scripts/T1914.stdout +++ b/testsuite/tests/ghci/scripts/T1914.stdout @@ -1,7 +1,7 @@ -[1 of 2] Compiling T1914B ( T1914B.hs, interpreted ) -[2 of 2] Compiling T1914A ( T1914A.hs, interpreted ) +[1 of 2] Compiling T1914B (.hs -> interpreted) +[2 of 2] Compiling T1914A (.hs -> interpreted) Ok, modules loaded: T1914A, T1914B. -[2 of 2] Compiling T1914A ( T1914A.hs, interpreted ) +[2 of 2] Compiling T1914A (.hs -> interpreted) Failed, modules loaded: T1914B. -[2 of 2] Compiling T1914A ( T1914A.hs, interpreted ) +[2 of 2] Compiling T1914A (.hs -> interpreted) Ok, modules loaded: T1914A, T1914B. diff --git a/testsuite/tests/ghci/scripts/T6105.stdout b/testsuite/tests/ghci/scripts/T6105.stdout index 73b6d2cdfb..c4a5f9de4f 100644 --- a/testsuite/tests/ghci/scripts/T6105.stdout +++ b/testsuite/tests/ghci/scripts/T6105.stdout @@ -1,4 +1,4 @@ -[1 of 1] Compiling T6105 ( T6105.hs, interpreted ) +[1 of 1] Compiling T6105 (.hs -> interpreted) Ok, modules loaded: T6105. -[1 of 1] Compiling T6105 ( T6105.hs, interpreted ) +[1 of 1] Compiling T6105 (.hs -> interpreted) Ok, modules loaded: T6105. diff --git a/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr b/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr index c2994dc1a5..6507bf0fe0 100644 --- a/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr +++ b/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr @@ -1,4 +1,4 @@ -[1 of 3] Compiling Hidden ( Hidden.hs, Hidden.o ) +[1 of 3] Compiling Hidden (.hs -> .o) ==================== Parser ==================== module Hidden where @@ -6,7 +6,7 @@ hidden :: Int -> Int hidden a = a -[2 of 3] Compiling Visible ( Visible.hs, Visible.o ) +[2 of 3] Compiling Visible (.hs -> .o) ==================== Parser ==================== module Visible where @@ -14,7 +14,7 @@ visible :: Int -> Int visible a = a -[3 of 3] Compiling Test ( Test.hs, Test.o ) +[3 of 3] Compiling Test (.hs -> .o) ==================== Parser ==================== diff --git a/testsuite/tests/indexed-types/should_compile/impexp.stderr b/testsuite/tests/indexed-types/should_compile/impexp.stderr index 7ebebe9e03..37d26e7f90 100644 --- a/testsuite/tests/indexed-types/should_compile/impexp.stderr +++ b/testsuite/tests/indexed-types/should_compile/impexp.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling Exp ( Exp.hs, Exp.o ) -[2 of 2] Compiling Imp ( Imp.hs, Imp.o ) +[1 of 2] Compiling Exp (.hs -> .o) +[2 of 2] Compiling Imp (.hs -> .o) diff --git a/testsuite/tests/indexed-types/should_fail/T9580.stderr b/testsuite/tests/indexed-types/should_fail/T9580.stderr index 5612906f84..1bc0eb82da 100644 --- a/testsuite/tests/indexed-types/should_fail/T9580.stderr +++ b/testsuite/tests/indexed-types/should_fail/T9580.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling T9580a ( T9580a.hs, T9580a.o ) -[2 of 2] Compiling T9580 ( T9580.hs, T9580.o ) +[1 of 2] Compiling T9580a (.hs -> .o) +[2 of 2] Compiling T9580 (.hs -> .o) T9580.hs:7:9: error: Couldn't match representation of type ‘Dimensional Int Double’ diff --git a/testsuite/tests/module/T11970A.stderr b/testsuite/tests/module/T11970A.stderr index 6b478a7335..ad71e2e8ec 100644 --- a/testsuite/tests/module/T11970A.stderr +++ b/testsuite/tests/module/T11970A.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling T11970A1 ( T11970A1.hs, T11970A1.o ) -[2 of 2] Compiling T11970A ( T11970A.hs, T11970A.o ) +[1 of 2] Compiling T11970A1 (.hs -> .o) +[2 of 2] Compiling T11970A (.hs -> .o) T11970A.hs:3:1: warning: [-Wunused-imports (in -Wextra)] The import of ‘Fail(b)’ from module ‘T11970A1’ is redundant diff --git a/testsuite/tests/module/base01/base01.stdout b/testsuite/tests/module/base01/base01.stdout index 9ab7d2124e..ca464f0f7e 100644 --- a/testsuite/tests/module/base01/base01.stdout +++ b/testsuite/tests/module/base01/base01.stdout @@ -1 +1 @@ -[2 of 2] Compiling GHC.Foo ( GHC/Foo.hs, GHC/Foo.o ) +[2 of 2] Compiling GHC.Foo (.hs -> .o) diff --git a/testsuite/tests/overloadedrecflds/should_fail/T11167_ambiguous_fixity.stderr b/testsuite/tests/overloadedrecflds/should_fail/T11167_ambiguous_fixity.stderr index 2a107d6570..b859d46a57 100644 --- a/testsuite/tests/overloadedrecflds/should_fail/T11167_ambiguous_fixity.stderr +++ b/testsuite/tests/overloadedrecflds/should_fail/T11167_ambiguous_fixity.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling T11167_ambiguous_fixity_A ( T11167_ambiguous_fixity_A.hs, T11167_ambiguous_fixity_A.o ) -[2 of 3] Compiling T11167_ambiguous_fixity_B ( T11167_ambiguous_fixity_B.hs, T11167_ambiguous_fixity_B.o ) -[3 of 3] Compiling T11167_ambiguous_fixity ( T11167_ambiguous_fixity.hs, T11167_ambiguous_fixity.o ) +[1 of 3] Compiling T11167_ambiguous_fixity_A (.hs -> .o) +[2 of 3] Compiling T11167_ambiguous_fixity_B (.hs -> .o) +[3 of 3] Compiling T11167_ambiguous_fixity (.hs -> .o) T11167_ambiguous_fixity.hs:6:7: error: Ambiguous fixity for record field ‘foo’ diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr index 579735470c..b0970ea0ca 100644 --- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr +++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr @@ -1,7 +1,7 @@ -[1 of 2] Compiling OverloadedRecFldsFail04_A ( OverloadedRecFldsFail04_A.hs, OverloadedRecFldsFail04_A.o ) -[2 of 2] Compiling Main ( overloadedrecfldsfail04.hs, overloadedrecfldsfail04.o ) +[1 of 2] Compiling OverloadedRecFldsFail04_A (.hs -> .o) +[2 of 2] Compiling Main (.hs -> .o) -overloadedrecfldsfail04.hs:9:6: +overloadedrecfldsfail04.hs:9:6: error: Ambiguous occurrence ‘I.x’ It could refer to either the field ‘x’, imported from ‘OverloadedRecFldsFail04_A’ at overloadedrecfldsfail04.hs:6:1-37 diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr index dc8a9d6bbc..6baa5ad397 100644 --- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr +++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr @@ -1,4 +1,4 @@ -[1 of 2] Compiling OverloadedRecFldsFail06_A ( OverloadedRecFldsFail06_A.hs, OverloadedRecFldsFail06_A.o ) +[1 of 2] Compiling OverloadedRecFldsFail06_A (.hs -> .o) OverloadedRecFldsFail06_A.hs:9:15: warning: [-Wunused-top-binds (in -Wextra, -Wunused-binds)] Defined but not used: data constructor ‘MkUnused’ @@ -8,7 +8,7 @@ OverloadedRecFldsFail06_A.hs:9:42: warning: [-Wunused-top-binds (in -Wextra, -Wu OverloadedRecFldsFail06_A.hs:9:59: warning: [-Wunused-top-binds (in -Wextra, -Wunused-binds)] Defined but not used: ‘used_locally’ -[2 of 2] Compiling Main ( overloadedrecfldsfail06.hs, overloadedrecfldsfail06.o ) +[2 of 2] Compiling Main (.hs -> .o) overloadedrecfldsfail06.hs:7:1: warning: [-Wunused-imports (in -Wextra)] The import of ‘Unused(unused), V(x), U(y), MkV, Unused’ diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr index 9be384b500..d1455baaae 100644 --- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr +++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr @@ -1,7 +1,7 @@ -[1 of 4] Compiling OverloadedRecFldsFail10_A ( OverloadedRecFldsFail10_A.hs, OverloadedRecFldsFail10_A.o ) -[2 of 4] Compiling OverloadedRecFldsFail10_B ( OverloadedRecFldsFail10_B.hs, OverloadedRecFldsFail10_B.o ) -[3 of 4] Compiling OverloadedRecFldsFail10_C ( OverloadedRecFldsFail10_C.hs, OverloadedRecFldsFail10_C.o ) -[4 of 4] Compiling Main ( overloadedrecfldsfail10.hs, overloadedrecfldsfail10.o ) +[1 of 4] Compiling OverloadedRecFldsFail10_A (.hs -> .o) +[2 of 4] Compiling OverloadedRecFldsFail10_B (.hs -> .o) +[3 of 4] Compiling OverloadedRecFldsFail10_C (.hs -> .o) +[4 of 4] Compiling Main (.hs -> .o) overloadedrecfldsfail10.hs:6:20: error: Conflicting exports for ‘foo’: diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr index dac6d29ef2..79a768aae9 100644 --- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr +++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling OverloadedRecFldsFail11_A ( OverloadedRecFldsFail11_A.hs, OverloadedRecFldsFail11_A.o ) -[2 of 2] Compiling Main ( overloadedrecfldsfail11.hs, overloadedrecfldsfail11.o ) +[1 of 2] Compiling OverloadedRecFldsFail11_A (.hs -> .o) +[2 of 2] Compiling Main (.hs -> .o) overloadedrecfldsfail11.hs:5:15: warning: [-Wdeprecations (in -Wdefault)] In the use of ‘foo’ (imported from OverloadedRecFldsFail11_A): diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr index 7cd9151c56..ef8c135114 100644 --- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr +++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling OverloadedRecFldsFail12_A ( OverloadedRecFldsFail12_A.hs, OverloadedRecFldsFail12_A.o ) -[2 of 2] Compiling Main ( overloadedrecfldsfail12.hs, overloadedrecfldsfail12.o ) +[1 of 2] Compiling OverloadedRecFldsFail12_A (.hs -> .o) +[2 of 2] Compiling Main (.hs -> .o) overloadedrecfldsfail12.hs:10:11: warning: [-Wdeprecations (in -Wdefault)] In the use of ‘foo’ (imported from OverloadedRecFldsFail12_A): diff --git a/testsuite/tests/parser/should_compile/T5243.stderr b/testsuite/tests/parser/should_compile/T5243.stderr index 450e001237..18cffcbad9 100644 --- a/testsuite/tests/parser/should_compile/T5243.stderr +++ b/testsuite/tests/parser/should_compile/T5243.stderr @@ -1,3 +1,3 @@ -[1 of 2] Compiling T5243A ( T5243A.hs, T5243A.o ) -[2 of 2] Compiling Main ( T5243.hs, T5243.o ) +[1 of 2] Compiling T5243A (.hs -> .o) +[2 of 2] Compiling Main (.hs -> .o) Linking T5243 ... diff --git a/testsuite/tests/partial-sigs/should_compile/SplicesUsed.stderr b/testsuite/tests/partial-sigs/should_compile/SplicesUsed.stderr index fc12b71b6b..131c83a3d6 100644 --- a/testsuite/tests/partial-sigs/should_compile/SplicesUsed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SplicesUsed.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling Splices ( Splices.hs, Splices.o ) -[2 of 2] Compiling SplicesUsed ( SplicesUsed.hs, SplicesUsed.o ) +[1 of 2] Compiling Splices (.hs -> .o) +[2 of 2] Compiling SplicesUsed (.hs -> .o) SplicesUsed.hs:7:16: warning: [-Wpartial-type-signatures (in -Wdefault)] • Found type wildcard ‘_’ standing for ‘Maybe Bool’ diff --git a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSpliceUsed.stderr b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSpliceUsed.stderr index a8f98d9e62..2e7d4226be 100644 --- a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSpliceUsed.stderr +++ b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSpliceUsed.stderr @@ -1,4 +1,4 @@ -[1 of 2] Compiling ExtraConstraintsWildcardInTypeSplice ( ExtraConstraintsWildcardInTypeSplice.hs, ExtraConstraintsWildcardInTypeSplice.o ) +[1 of 2] Compiling ExtraConstraintsWildcardInTypeSplice (.hs -> .o) ExtraConstraintsWildcardInTypeSplice.hs:7:16: error: • Wildcard ‘_’ not allowed in a constraint diff --git a/testsuite/tests/plugins/Makefile b/testsuite/tests/plugins/Makefile index d0cdca6f1c..4a8af8c917 100644 --- a/testsuite/tests/plugins/Makefile +++ b/testsuite/tests/plugins/Makefile @@ -45,5 +45,5 @@ T11244: .PHONY: T12567a T12567a: "$(TEST_HC)" $(TEST_HC_OPTS) $(ghcPluginWayFlags) --make T12567a.hs -package-db simple-plugin/pkg.T12567a/local.package.conf -hide-all-plugin-packages -plugin-package simple-plugin 1>&2 - "$(TEST_HC)" $(TEST_HC_OPTS) $(ghcPluginWayFlags) --make -v T12567a.hs -package-db simple-plugin/pkg.T12567a/local.package.conf -hide-all-plugin-packages -plugin-package simple-plugin 2>&1 | grep "T12567a.hs, T12567a.o" 1>&2 + "$(TEST_HC)" $(TEST_HC_OPTS) $(ghcPluginWayFlags) --make T12567a.hs -package-db simple-plugin/pkg.T12567a/local.package.conf -hide-all-plugin-packages -plugin-package simple-plugin 2>&1 | grep ".hs -> .o" 1>&2 "$(TEST_HC)" $(TEST_HC_OPTS) $(ghcPluginWayFlags) --make T12567b.hs -package-db simple-plugin/pkg.T12567a/local.package.conf -hide-all-plugin-packages -plugin-package simple-plugin 1>&2 diff --git a/testsuite/tests/plugins/T12567a.stderr b/testsuite/tests/plugins/T12567a.stderr index aee35e3528..e94eb80534 100644 --- a/testsuite/tests/plugins/T12567a.stderr +++ b/testsuite/tests/plugins/T12567a.stderr @@ -1,10 +1,10 @@ -[1 of 1] Compiling T12567a ( T12567a.hs, T12567a.o ) +[1 of 1] Compiling T12567a (.hs -> .o) Simple Plugin Passes Queried Got options: Simple Plugin Pass Run -[1 of 1] Compiling T12567a ( T12567a.hs, T12567a.o ) [Simple.Plugin changed] -[1 of 2] Compiling T12567a ( T12567a.hs, T12567a.o ) [Simple.Plugin changed] +[1 of 1] Compiling T12567a (.hs -> .o) [Simple.Plugin changed] +[1 of 2] Compiling T12567a (.hs -> .o) [Simple.Plugin changed] Simple Plugin Passes Queried Got options: Simple Plugin Pass Run -[2 of 2] Compiling T12567b ( T12567b.hs, T12567b.o ) +[2 of 2] Compiling T12567b (.hs -> .o) diff --git a/testsuite/tests/plugins/frontend01.stdout b/testsuite/tests/plugins/frontend01.stdout index 84950bcbc9..c9b12beb3e 100644 --- a/testsuite/tests/plugins/frontend01.stdout +++ b/testsuite/tests/plugins/frontend01.stdout @@ -1,4 +1,4 @@ ["foobar"] -[1 of 1] Compiling Main ( frontend01.hs, frontend01.o ) +[1 of 1] Compiling Main (.hs -> .o) Linking frontend01 ... hello world diff --git a/testsuite/tests/rename/should_compile/T11624.stderr b/testsuite/tests/rename/should_compile/T11624.stderr index 9cde01450d..c5b965ca14 100644 --- a/testsuite/tests/rename/should_compile/T11624.stderr +++ b/testsuite/tests/rename/should_compile/T11624.stderr @@ -1,3 +1,3 @@ -[1 of 3] Compiling T11624[boot] ( T11624.hs-boot, T11624.o-boot ) -[2 of 3] Compiling T11624a ( T11624a.hs, T11624a.o ) -[3 of 3] Compiling T11624 ( T11624.hs, T11624.o ) +[1 of 3] Compiling T11624[boot] (.hs-boot -> .o-boot) +[2 of 3] Compiling T11624a (.hs -> .o) +[3 of 3] Compiling T11624 (.hs -> .o) diff --git a/testsuite/tests/rts/T9405.stdout b/testsuite/tests/rts/T9405.stdout index a62f1c2d1b..8d7cae61e5 100644 --- a/testsuite/tests/rts/T9405.stdout +++ b/testsuite/tests/rts/T9405.stdout @@ -1,3 +1,3 @@ -[1 of 1] Compiling Main ( T9405.hs, T9405.o ) +[1 of 1] Compiling Main (.hs -> .o) Linking T9405 ... Ticky-Ticky diff --git a/testsuite/tests/rts/linker_unload.stdout b/testsuite/tests/rts/linker_unload.stdout index 84697b99ba..da41b53202 100644 --- a/testsuite/tests/rts/linker_unload.stdout +++ b/testsuite/tests/rts/linker_unload.stdout @@ -1,3 +1,3 @@ -[1 of 1] Compiling LinkerUnload ( LinkerUnload.hs, LinkerUnload.o ) +[1 of 1] Compiling LinkerUnload (.hs -> .o) Linking linker_unload ... 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999
\ No newline at end of file diff --git a/testsuite/tests/safeHaskell/check/Check01.stderr b/testsuite/tests/safeHaskell/check/Check01.stderr index f5233f5d5a..095d3b9744 100644 --- a/testsuite/tests/safeHaskell/check/Check01.stderr +++ b/testsuite/tests/safeHaskell/check/Check01.stderr @@ -1,4 +1,4 @@ -[3 of 3] Compiling Check01 ( Check01.hs, Check01.o ) +[3 of 3] Compiling Check01 (.hs -> .o) -<no location info>: +<no location info>: error: The package (base-4.9.0.0) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/check/Check02.stderr b/testsuite/tests/safeHaskell/check/Check02.stderr index 708541b8ed..b9183dce45 100644 --- a/testsuite/tests/safeHaskell/check/Check02.stderr +++ b/testsuite/tests/safeHaskell/check/Check02.stderr @@ -1 +1 @@ -[3 of 3] Compiling Check02 ( Check02.hs, Check02.o ) +[3 of 3] Compiling Check02 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/check/Check03.stderr b/testsuite/tests/safeHaskell/check/Check03.stderr index 343803f6ff..77cf7af90d 100644 --- a/testsuite/tests/safeHaskell/check/Check03.stderr +++ b/testsuite/tests/safeHaskell/check/Check03.stderr @@ -1 +1 @@ -[3 of 3] Compiling Check03 ( Check03.hs, Check03.o ) +[3 of 3] Compiling Check03 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/check/Check04.stderr b/testsuite/tests/safeHaskell/check/Check04.stderr index ec3bdb1585..9eaed992db 100644 --- a/testsuite/tests/safeHaskell/check/Check04.stderr +++ b/testsuite/tests/safeHaskell/check/Check04.stderr @@ -1,2 +1,2 @@ -[4 of 4] Compiling Main ( Check04.hs, Check04.o ) +[4 of 4] Compiling Main (.hs -> .o) Linking Check04 ... diff --git a/testsuite/tests/safeHaskell/check/Check06.stderr b/testsuite/tests/safeHaskell/check/Check06.stderr index 78c2676fc6..fdc7f70fd0 100644 --- a/testsuite/tests/safeHaskell/check/Check06.stderr +++ b/testsuite/tests/safeHaskell/check/Check06.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling Check06_A ( Check06_A.hs, Check06_A.o ) -[2 of 2] Compiling Check06 ( Check06.hs, Check06.o ) +[1 of 2] Compiling Check06_A (.hs -> .o) +[2 of 2] Compiling Check06 (.hs -> .o) -<no location info>: +<no location info>: error: The package (base-4.9.0.0) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/check/Check07.stderr b/testsuite/tests/safeHaskell/check/Check07.stderr index f41fbe0bde..1c08775f9f 100644 --- a/testsuite/tests/safeHaskell/check/Check07.stderr +++ b/testsuite/tests/safeHaskell/check/Check07.stderr @@ -1,3 +1,3 @@ -[1 of 3] Compiling Check07_A ( Check07_A.hs, Check07_A.o ) -[2 of 3] Compiling Check07_B ( Check07_B.hs, Check07_B.o ) -[3 of 3] Compiling Check07 ( Check07.hs, Check07.o ) +[1 of 3] Compiling Check07_A (.hs -> .o) +[2 of 3] Compiling Check07_B (.hs -> .o) +[3 of 3] Compiling Check07 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/check/Check08.stderr b/testsuite/tests/safeHaskell/check/Check08.stderr index e081a984e8..e901f6baeb 100644 --- a/testsuite/tests/safeHaskell/check/Check08.stderr +++ b/testsuite/tests/safeHaskell/check/Check08.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling Check08_A ( Check08_A.hs, Check08_A.o ) -[2 of 3] Compiling Check08_B ( Check08_B.hs, Check08_B.o ) -[3 of 3] Compiling Check08 ( Check08.hs, Check08.o ) +[1 of 3] Compiling Check08_A (.hs -> .o) +[2 of 3] Compiling Check08_B (.hs -> .o) +[3 of 3] Compiling Check08 (.hs -> .o) <no location info>: error: The package (base-4.9.0.0) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/check/CheckB.stderr b/testsuite/tests/safeHaskell/check/CheckB.stderr index f8321b3704..8df711d1fc 100644 --- a/testsuite/tests/safeHaskell/check/CheckB.stderr +++ b/testsuite/tests/safeHaskell/check/CheckB.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling CheckB_Aux ( CheckB_Aux.hs, CheckB_Aux.o ) -[2 of 2] Compiling CheckB ( CheckB.hs, CheckB.o ) +[1 of 2] Compiling CheckB_Aux (.hs -> .o) +[2 of 2] Compiling CheckB (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr index cc3588f9c0..cdd36a70c3 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr +++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr @@ -1,4 +1,4 @@ -[2 of 2] Compiling Main ( ImpSafe03.hs, ImpSafe03.o ) +[2 of 2] Compiling Main (.hs -> .o) -<no location info>: - The package (bytestring-0.10.8.0) is required to be trusted but it isn't! +<no location info>: error: + The package (bytestring-0.10.8.1) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr index 20349c6024..a3e41c28cc 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap1.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling SH_Overlap1_B ( SH_Overlap1_B.hs, SH_Overlap1_B.o ) -[2 of 3] Compiling SH_Overlap1_A ( SH_Overlap1_A.hs, SH_Overlap1_A.o ) -[3 of 3] Compiling SH_Overlap1 ( SH_Overlap1.hs, SH_Overlap1.o ) +[1 of 3] Compiling SH_Overlap1_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap1_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap1 (.hs -> .o) SH_Overlap1.hs:15:8: error: Unsafe overlapping instances for C [Int] arising from a use of ‘f’ diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap10.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap10.stderr index c5aee56283..7d3ccae40b 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap10.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap10.stderr @@ -1,3 +1,3 @@ -[1 of 3] Compiling SH_Overlap10_B ( SH_Overlap10_B.hs, SH_Overlap10_B.o ) -[2 of 3] Compiling SH_Overlap10_A ( SH_Overlap10_A.hs, SH_Overlap10_A.o ) -[3 of 3] Compiling SH_Overlap10 ( SH_Overlap10.hs, SH_Overlap10.o ) +[1 of 3] Compiling SH_Overlap10_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap10_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap10 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr index aca02ef4a9..e5bf0bc9df 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap11.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling SH_Overlap11_B ( SH_Overlap11_B.hs, SH_Overlap11_B.o ) -[2 of 3] Compiling SH_Overlap11_A ( SH_Overlap11_A.hs, SH_Overlap11_A.o ) -[3 of 3] Compiling SH_Overlap11 ( SH_Overlap11.hs, SH_Overlap11.o ) +[1 of 3] Compiling SH_Overlap11_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap11_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap11 (.hs -> .o) SH_Overlap11.hs:1:16: warning: [-Wunsafe] ‘SH_Overlap11’ has been inferred as unsafe! diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr index b4f15515b0..4aea8351a6 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap2.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling SH_Overlap2_B ( SH_Overlap2_B.hs, SH_Overlap2_B.o ) -[2 of 3] Compiling SH_Overlap2_A ( SH_Overlap2_A.hs, SH_Overlap2_A.o ) -[3 of 3] Compiling SH_Overlap2 ( SH_Overlap2.hs, SH_Overlap2.o ) +[1 of 3] Compiling SH_Overlap2_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap2_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap2 (.hs -> .o) SH_Overlap2.hs:18:8: error: Unsafe overlapping instances for C [Int] arising from a use of ‘f’ diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap3.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap3.stderr index 8a0066f55e..8eccbc0cdf 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap3.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap3.stderr @@ -1,3 +1,3 @@ -[1 of 3] Compiling SH_Overlap3_B ( SH_Overlap3_B.hs, SH_Overlap3_B.o ) -[2 of 3] Compiling SH_Overlap3_A ( SH_Overlap3_A.hs, SH_Overlap3_A.o ) -[3 of 3] Compiling SH_Overlap3 ( SH_Overlap3.hs, SH_Overlap3.o ) +[1 of 3] Compiling SH_Overlap3_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap3_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap3 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap4.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap4.stderr index 6942269b85..5f9fb1c057 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap4.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap4.stderr @@ -1,3 +1,3 @@ -[1 of 3] Compiling SH_Overlap4_B ( SH_Overlap4_B.hs, SH_Overlap4_B.o ) -[2 of 3] Compiling SH_Overlap4_A ( SH_Overlap4_A.hs, SH_Overlap4_A.o ) -[3 of 3] Compiling SH_Overlap4 ( SH_Overlap4.hs, SH_Overlap4.o ) +[1 of 3] Compiling SH_Overlap4_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap4_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap4 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr index 8c2bc7df9d..97d7c76aa0 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap5.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling SH_Overlap5_B ( SH_Overlap5_B.hs, SH_Overlap5_B.o ) -[2 of 3] Compiling SH_Overlap5_A ( SH_Overlap5_A.hs, SH_Overlap5_A.o ) -[3 of 3] Compiling SH_Overlap5 ( SH_Overlap5.hs, SH_Overlap5.o ) +[1 of 3] Compiling SH_Overlap5_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap5_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap5 (.hs -> .o) SH_Overlap5.hs:15:8: error: Unsafe overlapping instances for C [Int] arising from a use of ‘f’ diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr index e5b7ac95d6..a2ca4a70e1 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap6.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling SH_Overlap6_B ( SH_Overlap6_B.hs, SH_Overlap6_B.o ) -[2 of 3] Compiling SH_Overlap6_A ( SH_Overlap6_A.hs, SH_Overlap6_A.o ) -[3 of 3] Compiling SH_Overlap6 ( SH_Overlap6.hs, SH_Overlap6.o ) +[1 of 3] Compiling SH_Overlap6_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap6_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap6 (.hs -> .o) SH_Overlap6.hs:14:8: error: Unsafe overlapping instances for C [Int] arising from a use of ‘f’ diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr index 8010407cc7..717f129dff 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap7.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling SH_Overlap7_B ( SH_Overlap7_B.hs, SH_Overlap7_B.o ) -[2 of 3] Compiling SH_Overlap7_A ( SH_Overlap7_A.hs, SH_Overlap7_A.o ) -[3 of 3] Compiling SH_Overlap7 ( SH_Overlap7.hs, SH_Overlap7.o ) +[1 of 3] Compiling SH_Overlap7_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap7_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap7 (.hs -> .o) SH_Overlap7.hs:1:16: warning: [-Wunsafe] ‘SH_Overlap7’ has been inferred as unsafe! diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.stderr index f53cd439bb..b3c0197104 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap8.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling SH_Overlap8_A ( SH_Overlap8_A.hs, SH_Overlap8_A.o ) -[2 of 2] Compiling SH_Overlap8 ( SH_Overlap8.hs, SH_Overlap8.o ) +[1 of 2] Compiling SH_Overlap8_A (.hs -> .o) +[2 of 2] Compiling SH_Overlap8 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/overlapping/SH_Overlap9.stderr b/testsuite/tests/safeHaskell/overlapping/SH_Overlap9.stderr index b94705c654..6b09a7fa6b 100644 --- a/testsuite/tests/safeHaskell/overlapping/SH_Overlap9.stderr +++ b/testsuite/tests/safeHaskell/overlapping/SH_Overlap9.stderr @@ -1,3 +1,3 @@ -[1 of 3] Compiling SH_Overlap9_B ( SH_Overlap9_B.hs, SH_Overlap9_B.o ) -[2 of 3] Compiling SH_Overlap9_A ( SH_Overlap9_A.hs, SH_Overlap9_A.o ) -[3 of 3] Compiling SH_Overlap9 ( SH_Overlap9.hs, SH_Overlap9.o ) +[1 of 3] Compiling SH_Overlap9_B (.hs -> .o) +[2 of 3] Compiling SH_Overlap9_A (.hs -> .o) +[3 of 3] Compiling SH_Overlap9 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr index 134cbbe20b..a8324e047c 100644 --- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling SafeInfered01_A ( SafeInfered01_A.hs, SafeInfered01_A.o ) -[2 of 2] Compiling SafeInfered01 ( SafeInfered01.hs, SafeInfered01.o ) +[1 of 2] Compiling SafeInfered01_A (.hs -> .o) +[2 of 2] Compiling SafeInfered01 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr index ffbce376b1..4954b70cdc 100644 --- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling SafeInfered02_A ( SafeInfered02_A.hs, SafeInfered02_A.o ) -[2 of 2] Compiling SafeInfered02 ( SafeInfered02.hs, SafeInfered02.o ) +[1 of 2] Compiling SafeInfered02_A (.hs -> .o) +[2 of 2] Compiling SafeInfered02 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr index 18940a98f2..3109ec0b71 100644 --- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling SafeInfered03_A ( SafeInfered03_A.hs, SafeInfered03_A.o ) -[2 of 2] Compiling SafeInfered03 ( SafeInfered03.hs, SafeInfered03.o ) +[1 of 2] Compiling SafeInfered03_A (.hs -> .o) +[2 of 2] Compiling SafeInfered03 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr index c264464886..8a394f43b6 100644 --- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling SafeInfered04_A ( SafeInfered04_A.hs, SafeInfered04_A.o ) -[2 of 2] Compiling SafeInfered04 ( SafeInfered04.hs, SafeInfered04.o ) +[1 of 2] Compiling SafeInfered04_A (.hs -> .o) +[2 of 2] Compiling SafeInfered04 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr index 5d194064b8..8c9e264273 100644 --- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr @@ -1,8 +1,8 @@ SafeInfered05.hs:2:14: warning: -XOverlappingInstances is deprecated: instead use per-instance pragmas OVERLAPPING/OVERLAPPABLE/OVERLAPS -[1 of 2] Compiling SafeInfered05_A ( SafeInfered05_A.hs, SafeInfered05_A.o ) +[1 of 2] Compiling SafeInfered05_A (.hs -> .o) SafeInfered05_A.hs:2:16: warning: [-Wsafe] ‘SafeInfered05_A’ has been inferred as safe! -[2 of 2] Compiling SafeInfered05 ( SafeInfered05.hs, SafeInfered05.o ) +[2 of 2] Compiling SafeInfered05 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr index f96f1719ae..dc2be49840 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr @@ -1,6 +1,6 @@ -[1 of 2] Compiling UnsafeInfered01_A ( UnsafeInfered01_A.hs, UnsafeInfered01_A.o ) -[2 of 2] Compiling UnsafeInfered01 ( UnsafeInfered01.hs, UnsafeInfered01.o ) +[1 of 2] Compiling UnsafeInfered01_A (.hs -> .o) +[2 of 2] Compiling UnsafeInfered01 (.hs -> .o) -UnsafeInfered01.hs:4:1: +UnsafeInfered01.hs:4:1: error: UnsafeInfered01_A: Can't be safely imported! The module itself isn't safe. diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr index 7bd9a17733..12e6ad3e8b 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr @@ -1,6 +1,6 @@ -[1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o ) -[2 of 2] Compiling UnsafeInfered02 ( UnsafeInfered02.hs, UnsafeInfered02.o ) +[1 of 2] Compiling UnsafeInfered02_A (.hs -> .o) +[2 of 2] Compiling UnsafeInfered02 (.hs -> .o) -UnsafeInfered02.hs:4:1: +UnsafeInfered02.hs:4:1: error: UnsafeInfered02_A: Can't be safely imported! The module itself isn't safe. diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr index ea21c40d48..8d28f8a64e 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr @@ -1,6 +1,6 @@ -[1 of 2] Compiling UnsafeInfered03_A ( UnsafeInfered03_A.hs, UnsafeInfered03_A.o ) -[2 of 2] Compiling UnsafeInfered03 ( UnsafeInfered03.hs, UnsafeInfered03.o ) +[1 of 2] Compiling UnsafeInfered03_A (.hs -> .o) +[2 of 2] Compiling UnsafeInfered03 (.hs -> .o) -UnsafeInfered03.hs:4:1: +UnsafeInfered03.hs:4:1: error: UnsafeInfered03_A: Can't be safely imported! The module itself isn't safe. diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr index 2b23ce076f..354d026927 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr @@ -1,6 +1,6 @@ -[1 of 2] Compiling UnsafeInfered05_A ( UnsafeInfered05_A.hs, UnsafeInfered05_A.o ) -[2 of 2] Compiling UnsafeInfered05 ( UnsafeInfered05.hs, UnsafeInfered05.o ) +[1 of 2] Compiling UnsafeInfered05_A (.hs -> .o) +[2 of 2] Compiling UnsafeInfered05 (.hs -> .o) -UnsafeInfered05.hs:4:1: +UnsafeInfered05.hs:4:1: error: UnsafeInfered05_A: Can't be safely imported! The module itself isn't safe. diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr index 73c182535c..738feecf94 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr @@ -1,6 +1,6 @@ -[1 of 2] Compiling UnsafeInfered06_A ( UnsafeInfered06_A.hs, UnsafeInfered06_A.o ) -[2 of 2] Compiling UnsafeInfered06 ( UnsafeInfered06.hs, UnsafeInfered06.o ) +[1 of 2] Compiling UnsafeInfered06_A (.hs -> .o) +[2 of 2] Compiling UnsafeInfered06 (.hs -> .o) -UnsafeInfered06.hs:4:1: +UnsafeInfered06.hs:4:1: error: UnsafeInfered06_A: Can't be safely imported! The module itself isn't safe. diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr index 36f4ded2d5..5590e28c82 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling UnsafeInfered08_A ( UnsafeInfered08_A.hs, UnsafeInfered08_A.o ) -[2 of 2] Compiling UnsafeInfered08 ( UnsafeInfered08.hs, UnsafeInfered08.o ) +[1 of 2] Compiling UnsafeInfered08_A (.hs -> .o) +[2 of 2] Compiling UnsafeInfered08 (.hs -> .o) diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr index 42082c854e..4c1cfba83d 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr @@ -1,7 +1,7 @@ -[1 of 3] Compiling UnsafeInfered09_B ( UnsafeInfered09_B.hs, UnsafeInfered09_B.o ) -[2 of 3] Compiling UnsafeInfered09_A ( UnsafeInfered09_A.hs, UnsafeInfered09_A.o ) -[3 of 3] Compiling UnsafeInfered09 ( UnsafeInfered09.hs, UnsafeInfered09.o ) +[1 of 3] Compiling UnsafeInfered09_B (.hs -> .o) +[2 of 3] Compiling UnsafeInfered09_A (.hs -> .o) +[3 of 3] Compiling UnsafeInfered09 (.hs -> .o) -UnsafeInfered09.hs:4:1: +UnsafeInfered09.hs:4:1: error: UnsafeInfered09_A: Can't be safely imported! The module itself isn't safe. diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr index c67b891952..1402ed426f 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr @@ -1,6 +1,6 @@ -[1 of 2] Compiling UnsafeInfered10_A ( UnsafeInfered10_A.hs, UnsafeInfered10_A.o ) -[2 of 2] Compiling UnsafeInfered10 ( UnsafeInfered10.hs, UnsafeInfered10.o ) +[1 of 2] Compiling UnsafeInfered10_A (.hs -> .o) +[2 of 2] Compiling UnsafeInfered10 (.hs -> .o) -UnsafeInfered10.hs:5:1: +UnsafeInfered10.hs:5:1: error: UnsafeInfered10_A: Can't be safely imported! The module itself isn't safe. diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr index 18a6a459c7..98d3c495ed 100644 --- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr +++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr @@ -1,4 +1,4 @@ -[1 of 2] Compiling UnsafeInfered11_A ( UnsafeInfered11_A.hs, UnsafeInfered11_A.o ) +[1 of 2] Compiling UnsafeInfered11_A (.hs -> .o) UnsafeInfered11_A.hs:1:16: warning: [-Wunsafe] ‘UnsafeInfered11_A’ has been inferred as unsafe! @@ -6,7 +6,7 @@ UnsafeInfered11_A.hs:1:16: warning: [-Wunsafe] UnsafeInfered11_A.hs:17:11: warning: Rule "lookupx/T" ignored User defined rules are disabled under Safe Haskell -[2 of 2] Compiling UnsafeInfered11 ( UnsafeInfered11.hs, UnsafeInfered11.o ) +[2 of 2] Compiling UnsafeInfered11 (.hs -> .o) UnsafeInfered11.hs:5:1: error: UnsafeInfered11_A: Can't be safely imported! diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr index d0c5c68d6a..32abdd46c0 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling SafeLang10_A ( SafeLang10_A.hs, SafeLang10_A.o ) -[2 of 3] Compiling SafeLang10_B ( SafeLang10_B.hs, SafeLang10_B.o ) -[3 of 3] Compiling Main ( SafeLang10.hs, SafeLang10.o ) +[1 of 3] Compiling SafeLang10_A (.hs -> .o) +[2 of 3] Compiling SafeLang10_B (.hs -> .o) +[3 of 3] Compiling Main (.hs -> .o) SafeLang10.hs:8:13: Unsafe overlapping instances for Pos [Int] diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr index b23875bf1d..33d7e346da 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr @@ -4,8 +4,8 @@ SafeLang12.hs:2:14: warning: SafeLang12_B.hs:2:14: warning: -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell -[1 of 3] Compiling SafeLang12_A ( SafeLang12_A.hs, SafeLang12_A.o ) -[2 of 3] Compiling SafeLang12_B ( SafeLang12_B.hs, SafeLang12_B.o ) +[1 of 3] Compiling SafeLang12_A (.hs -> .o) +[2 of 3] Compiling SafeLang12_B (.hs -> .o) SafeLang12_B.hs:5:1: error: Language.Haskell.TH: Can't be safely imported! diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr index c59f86670a..4665f62a64 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr @@ -1,6 +1,6 @@ -[1 of 3] Compiling SafeLang17_A ( SafeLang17_A.hs, SafeLang17_A.o ) -[2 of 3] Compiling SafeLang17_B ( SafeLang17_B.hs, SafeLang17_B.o ) -[3 of 3] Compiling Main ( SafeLang17.hs, SafeLang17.o ) +[1 of 3] Compiling SafeLang17_A (.hs -> .o) +[2 of 3] Compiling SafeLang17_B (.hs -> .o) +[3 of 3] Compiling Main (.hs -> .o) SafeLang17.hs:8:13: Unsafe overlapping instances for Pos [Int] diff --git a/testsuite/tests/typecheck/should_compile/T6018.stderr b/testsuite/tests/typecheck/should_compile/T6018.stderr index b843f5f53d..91d6b300d6 100644 --- a/testsuite/tests/typecheck/should_compile/T6018.stderr +++ b/testsuite/tests/typecheck/should_compile/T6018.stderr @@ -1,11 +1,11 @@ -[1 of 3] Compiling T6018[boot] ( T6018.hs-boot, T6018.o-boot ) -[2 of 3] Compiling T6018a ( T6018a.hs, T6018a.o ) -[3 of 3] Compiling T6018 ( T6018.hs, T6018.o ) +[1 of 3] Compiling T6018[boot] (.hs-boot -> .o-boot) +[2 of 3] Compiling T6018a (.hs -> .o) +[3 of 3] Compiling T6018 (.hs -> .o) -T6018.hs:75:5: Warning: +T6018.hs:75:5: warning: Type family instance equation is overlapped: Foo Bool = Bool -- Defined at T6018.hs:75:5 -T6018.hs:82:5: Warning: +T6018.hs:82:5: warning: Type family instance equation is overlapped: Bar Bool = Char -- Defined at T6018.hs:82:5 diff --git a/testsuite/tests/typecheck/should_compile/tc245.stdout b/testsuite/tests/typecheck/should_compile/tc245.stdout index 00beb40f5f..218dc19619 100644 --- a/testsuite/tests/typecheck/should_compile/tc245.stdout +++ b/testsuite/tests/typecheck/should_compile/tc245.stdout @@ -1,3 +1,3 @@ -[1 of 2] Compiling Tc245_A ( Tc245_A.hs, Tc245_A.o ) -[2 of 2] Compiling Tc245 ( tc245.hs, tc245.o ) -[2 of 2] Compiling Tc245 ( tc245.hs, tc245.o ) +[1 of 2] Compiling Tc245_A (.hs -> .o) +[2 of 2] Compiling Tc245 (.hs -> .o) +[2 of 2] Compiling Tc245 (.hs -> .o) diff --git a/testsuite/tests/typecheck/should_fail/T6018fail.stderr b/testsuite/tests/typecheck/should_fail/T6018fail.stderr index e40cb84d12..9ca3ee0438 100644 --- a/testsuite/tests/typecheck/should_fail/T6018fail.stderr +++ b/testsuite/tests/typecheck/should_fail/T6018fail.stderr @@ -1,8 +1,8 @@ -[1 of 5] Compiling T6018Afail ( T6018Afail.hs, T6018Afail.o ) -[2 of 5] Compiling T6018Bfail ( T6018Bfail.hs, T6018Bfail.o ) -[3 of 5] Compiling T6018Cfail ( T6018Cfail.hs, T6018Cfail.o ) -[4 of 5] Compiling T6018Dfail ( T6018Dfail.hs, T6018Dfail.o ) -[5 of 5] Compiling T6018fail ( T6018fail.hs, T6018fail.o ) +[1 of 5] Compiling T6018Afail (.hs -> .o) +[2 of 5] Compiling T6018Bfail (.hs -> .o) +[3 of 5] Compiling T6018Cfail (.hs -> .o) +[4 of 5] Compiling T6018Dfail (.hs -> .o) +[5 of 5] Compiling T6018fail (.hs -> .o) T6018Afail.hs:7:15: error: Type family equations violate injectivity annotation: diff --git a/testsuite/tests/unboxedsums/module/sum_mod.stdout b/testsuite/tests/unboxedsums/module/sum_mod.stdout index 615266b7f6..e2fdcc2714 100644 --- a/testsuite/tests/unboxedsums/module/sum_mod.stdout +++ b/testsuite/tests/unboxedsums/module/sum_mod.stdout @@ -1,3 +1,3 @@ -[2 of 2] Compiling Main ( Main.hs, Main.o ) +[2 of 2] Compiling Main (.hs -> .o) Linking Main ... 123 diff --git a/testsuite/tests/warnings/should_compile/DeprU.stderr b/testsuite/tests/warnings/should_compile/DeprU.stderr index 158f25228f..3825668753 100644 --- a/testsuite/tests/warnings/should_compile/DeprU.stderr +++ b/testsuite/tests/warnings/should_compile/DeprU.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling DeprM ( DeprM.hs, DeprM.o ) -[2 of 2] Compiling A ( DeprU.hs, DeprU.o ) +[1 of 2] Compiling DeprM (.hs -> .o) +[2 of 2] Compiling A (.hs -> .o) DeprU.hs:3:1: warning: [-Wdeprecations (in -Wdefault)] Module ‘DeprM’ is deprecated: diff --git a/testsuite/tests/warnings/should_compile/T9178.stderr b/testsuite/tests/warnings/should_compile/T9178.stderr index 6edcbff5ec..fecb8d9ecc 100644 --- a/testsuite/tests/warnings/should_compile/T9178.stderr +++ b/testsuite/tests/warnings/should_compile/T9178.stderr @@ -1,5 +1,5 @@ -[1 of 2] Compiling T9178DataType ( T9178DataType.hs, T9178DataType.o ) -[2 of 2] Compiling T9178 ( T9178.hs, T9178.o ) +[1 of 2] Compiling T9178DataType (.hs -> .o) +[2 of 2] Compiling T9178 (.hs -> .o) T9178.hs:8:1: warning: [-Worphans (in -Wall)] Orphan instance: instance Show T9178_Type diff --git a/utils/mkUserGuidePart/Options/Verbosity.hs b/utils/mkUserGuidePart/Options/Verbosity.hs index 9f9678ae2d..8a29d71b75 100644 --- a/utils/mkUserGuidePart/Options/Verbosity.hs +++ b/utils/mkUserGuidePart/Options/Verbosity.hs @@ -13,6 +13,11 @@ verbosityOptions = , flagType = DynamicFlag , flagReverse = "" } + , flag { flagName = "-fshow-source-paths" + , flagDescription = "show module source and object paths" + , flagType = DynamicFlag + , flagReverse = "" + } , flag { flagName = "-fprint-potential-instances" , flagDescription = "display all available instances in type error messages" |