diff options
| author | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
|---|---|---|
| committer | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
| commit | 5a1b4f814f74ec1c48152d97523744518e212777 (patch) | |
| tree | 7c2207ecacbd37f12c78dbcf9d4334827164e0fb /testsuite/tests/driver/sigof02 | |
| parent | 6757950cdd8bb0af0355539987ee78401a6a8f6b (diff) | |
| parent | 808bbdf08058785ae5bc59b5b4f2b04951d4cbbf (diff) | |
| download | haskell-wip/orf-reboot.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot
Conflicts:
compiler/rename/RnNames.hs
compiler/typecheck/TcRnMonad.hs
utils/haddock
Diffstat (limited to 'testsuite/tests/driver/sigof02')
| -rw-r--r-- | testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 | 8 | ||||
| -rw-r--r-- | testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 index 3c8a1fa00c..7fde989bc4 100644 --- a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 +++ b/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 @@ -1,6 +1,8 @@ -[1 of 3] Compiling MapAsSet[sig of Data.Map.Lazy] ( MapAsSet.hsig, nothing ) -[2 of 3] Compiling Map[sig of Data.Map.Lazy] ( Map.hsig, nothing ) -[3 of 3] Compiling Main ( Double.hs, tmp_sigof02dm\Main.o ) +[1 of 5] Compiling MapAsSet[boot] ( MapAsSet.hs-boot, tmp_sigof02dm\MapAsSet.o-boot ) +[2 of 5] Compiling MapAsSet[merge] ( MapAsSet.hi, tmp_sigof02dm\MapAsSet.o ) +[3 of 5] Compiling Map[boot] ( Map.hs-boot, tmp_sigof02dm\Map.o-boot ) +[4 of 5] Compiling Map[merge] ( Map.hi, tmp_sigof02dm\Map.o ) +[5 of 5] Compiling Main ( Double.hs, tmp_sigof02dm\Main.o ) Linking tmp_sigof02dm/Double.exe ... False fromList [0,6] diff --git a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 index 65b1857c49..f7cca89866 100644 --- a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 +++ b/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 @@ -1,8 +1,10 @@ -[1 of 2] Compiling Map[sig of Data.Map.Strict] ( Map.hsig, nothing ) -[2 of 2] Compiling Main ( Main.hs, tmp_sigof02m\Main.o ) +[1 of 3] Compiling Map[boot] ( Map.hs-boot, tmp_sigof02m\Map.o-boot ) +[2 of 3] Compiling Map[merge] ( Map.hi, tmp_sigof02m\Map.o ) +[3 of 3] Compiling Main ( Main.hs, tmp_sigof02m\Main.o ) Linking tmp_sigof02m/StrictMain.exe ... -[1 of 2] Compiling Map[sig of Data.Map.Lazy] ( Map.hsig, nothing ) [sig-of changed] -[2 of 2] Compiling Main ( Main.hs, tmp_sigof02m\Main.o ) [Map changed] +[1 of 3] Compiling Map[boot] ( Map.hs-boot, tmp_sigof02m\Map.o-boot ) [sig-of changed] +[2 of 3] Compiling Map[merge] ( Map.hi, tmp_sigof02m\Map.o ) [sig-of changed] +[3 of 3] Compiling Main ( Main.hs, tmp_sigof02m\Main.o ) [Map changed] Linking tmp_sigof02m/LazyMain.exe ... False [(0,"foo"),(6,"foo")] |