driver: Correctly pass custom messenger to logging function

This was an oversight from !6718

6 files changed, 27 insertions, 27 deletions

diff --git a/testsuite/tests/backpack/reexport/bkpreex03.stdout b/testsuite/tests/backpack/reexport/bkpreex03.stdout
index f35b52c198..ddd2552e5a 100644
--- a/testsuite/tests/backpack/reexport/bkpreex03.stdout
+++ b/testsuite/tests/backpack/reexport/bkpreex03.stdout
@@ -1,6 +1,6 @@
 [1 of 1] Processing p
-[1 of 3] Compiling M1
-[2 of 3] Compiling M2
-[3 of 3] Compiling A[sig]
+  [1 of 3] Compiling M1
+  [2 of 3] Compiling M2
+  [3 of 3] Compiling A[sig]
 [1 of 1] Processing p
-[3 of 3] Compiling A[sig] [M2 added]
+  [3 of 3] Compiling A[sig] [M2 added]
diff --git a/testsuite/tests/backpack/reexport/bkpreex04.stdout b/testsuite/tests/backpack/reexport/bkpreex04.stdout
index 376747c456..7ed3acaa1d 100644
--- a/testsuite/tests/backpack/reexport/bkpreex04.stdout
+++ b/testsuite/tests/backpack/reexport/bkpreex04.stdout
@@ -1,5 +1,5 @@
 [1 of 1] Processing p
-[1 of 2] Compiling A[sig]
-[2 of 2] Compiling B[sig]
+  [1 of 2] Compiling A[sig]
+  [2 of 2] Compiling B[sig]
 [1 of 1] Processing p
-[2 of 2] Compiling A[sig] [B added]
+  [2 of 2] Compiling A[sig] [B added]
diff --git a/testsuite/tests/backpack/should_compile/bkp58.stderr b/testsuite/tests/backpack/should_compile/bkp58.stderr
index a33a9d66bc..3f36e43701 100644
--- a/testsuite/tests/backpack/should_compile/bkp58.stderr
+++ b/testsuite/tests/backpack/should_compile/bkp58.stderr
@@ -1,13 +1,13 @@
 [1 of 3] Processing common
   Instantiating common
-[1 of 1] Compiling Class            ( common/Class.hs, bkp58.out/common/Class.o )
+  [1 of 1] Compiling Class            ( common/Class.hs, bkp58.out/common/Class.o )
 [2 of 3] Processing consumer-impl
   Instantiating consumer-impl
   [1 of 1] Including common
-[1 of 3] Compiling Impl[boot]       ( consumer-impl/Impl.hs-boot, bkp58.out/consumer-impl/Impl.o-boot )
-[2 of 3] Compiling Downstream       ( consumer-impl/Downstream.hs, bkp58.out/consumer-impl/Downstream.o )
-[3 of 3] Compiling Impl             ( consumer-impl/Impl.hs, bkp58.out/consumer-impl/Impl.o )
+  [1 of 3] Compiling Impl[boot]       ( consumer-impl/Impl.hs-boot, bkp58.out/consumer-impl/Impl.o-boot )
+  [2 of 3] Compiling Downstream       ( consumer-impl/Downstream.hs, bkp58.out/consumer-impl/Downstream.o )
+  [3 of 3] Compiling Impl             ( consumer-impl/Impl.hs, bkp58.out/consumer-impl/Impl.o )
 [3 of 3] Processing tie
   Instantiating tie
   [1 of 1] Including consumer-impl
-[1 of 1] Compiling Tie              ( tie/Tie.hs, bkp58.out/tie/Tie.o )
+  [1 of 1] Compiling Tie              ( tie/Tie.hs, bkp58.out/tie/Tie.o )
diff --git a/testsuite/tests/backpack/should_compile/bkp60.stderr b/testsuite/tests/backpack/should_compile/bkp60.stderr
index 8e22b1058e..6a5732b961 100644
--- a/testsuite/tests/backpack/should_compile/bkp60.stderr
+++ b/testsuite/tests/backpack/should_compile/bkp60.stderr
@@ -1,13 +1,13 @@
 [1 of 3] Processing common
   Instantiating common
-[1 of 1] Compiling Class            ( common/Class.hs, bkp60.out/common/Class.o )
+  [1 of 1] Compiling Class            ( common/Class.hs, bkp60.out/common/Class.o )
 [2 of 3] Processing consumer-impl
   Instantiating consumer-impl
   [1 of 1] Including common
-[1 of 3] Compiling Impl[boot]       ( consumer-impl/Impl.hs-boot, bkp60.out/consumer-impl/Impl.o-boot )
-[2 of 3] Compiling Downstream       ( consumer-impl/Downstream.hs, bkp60.out/consumer-impl/Downstream.o )
-[3 of 3] Compiling Impl             ( consumer-impl/Impl.hs, bkp60.out/consumer-impl/Impl.o )
+  [1 of 3] Compiling Impl[boot]       ( consumer-impl/Impl.hs-boot, bkp60.out/consumer-impl/Impl.o-boot )
+  [2 of 3] Compiling Downstream       ( consumer-impl/Downstream.hs, bkp60.out/consumer-impl/Downstream.o )
+  [3 of 3] Compiling Impl             ( consumer-impl/Impl.hs, bkp60.out/consumer-impl/Impl.o )
 [3 of 3] Processing tie
   Instantiating tie
   [1 of 1] Including consumer-impl
-[1 of 1] Compiling Tie              ( tie/Tie.hs, bkp60.out/tie/Tie.o )
+  [1 of 1] Compiling Tie              ( tie/Tie.hs, bkp60.out/tie/Tie.o )
diff --git a/testsuite/tests/backpack/should_fail/bkpfail28.stderr b/testsuite/tests/backpack/should_fail/bkpfail28.stderr
index d6f267648c..7e90a61af7 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]           ( p/A.hsig, nothing )
 [2 of 3] Processing q
-[1 of 1] Compiling A[sig]           ( q/A.hsig, nothing )
+  [1 of 1] Compiling A[sig]           ( q/A.hsig, nothing )
 [3 of 3] Processing r
-[1 of 4] Compiling A[sig]           ( r/A.hsig, nothing )
-[2 of 4] Compiling R                ( r/R.hs, nothing )
+  [1 of 4] Compiling A[sig]           ( r/A.hsig, nothing )
+  [2 of 4] Compiling R                ( r/R.hs, nothing )
 
 bkpfail28.bkp:19:13: error:
     • Overlapping instances for Show (K a) arising from a use of ‘show’
@@ -25,5 +25,5 @@ bkpfail28.bkp:21:13: error:
           -- Defined at bkpfail28.bkp:12:18
     • In the expression: show
       In an equation for ‘g’: g = show
-[3 of 4] Instantiating p
-[4 of 4] Instantiating q
+  [3 of 4] Instantiating p
+  [4 of 4] Instantiating q
diff --git a/testsuite/tests/backpack/should_fail/bkpfail49.stderr b/testsuite/tests/backpack/should_fail/bkpfail49.stderr
index a140bbfade..b6b60e2b86 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail49.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail49.stderr
@@ -1,10 +1,10 @@
 [1 of 2] Processing p
-[1 of 1] Compiling A[sig]           ( p/A.hsig, nothing )
+  [1 of 1] Compiling A[sig]           ( p/A.hsig, nothing )
 [2 of 2] Processing q
-[1 of 3] Compiling A[sig]           ( q/A.hsig, nothing )
-[2 of 3] Compiling M                ( q/M.hs, nothing )
+  [1 of 3] Compiling A[sig]           ( q/A.hsig, nothing )
+  [2 of 3] Compiling M                ( q/M.hs, nothing )
 
 bkpfail49.bkp:11:13: error:
     Not in scope: data constructor ‘A.True’
     Module ‘A’ does not export ‘True’.
-[3 of 3] Instantiating p
+  [3 of 3] Instantiating p