Testsuite: delete Windows line endings [skip ci] (#11631)

90 files changed, 535 insertions, 546 deletions

diff --git a/libraries/base/tests/IO/hGetLine001.stdout b/libraries/base/tests/IO/hGetLine001.stdout
index 3e023db8f5..ab88bf0216 100644
--- a/libraries/base/tests/IO/hGetLine001.stdout
+++ b/libraries/base/tests/IO/hGetLine001.stdout
@@ -1,100 +1,100 @@
--- !!! testing hGetLine

-

-import System.IO

-

--- one version of 'cat'

-main = do

-  let loop h = do b <- hIsEOF h

-        	  if b then return ()

-		       else do l <- hGetLine h; putStrLn l; loop h

-  loop stdin 

-

-  h <- openFile "hGetLine001.hs" ReadMode

-

-  hSetBinaryMode stdout True

-

-  hSetBuffering h NoBuffering

-  loop h

-

-  hSeek h AbsoluteSeek 0

-  hSetBuffering h LineBuffering

-  loop h

-

-  hSeek h AbsoluteSeek 0

-  hSetBuffering h (BlockBuffering (Just 83))

-  loop h

--- !!! testing hGetLine

-

-import System.IO

-

--- one version of 'cat'

-main = do

-  let loop h = do b <- hIsEOF h

-        	  if b then return ()

-		       else do l <- hGetLine h; putStrLn l; loop h

-  loop stdin 

-

-  h <- openFile "hGetLine001.hs" ReadMode

-

-  hSetBinaryMode stdout True

-

-  hSetBuffering h NoBuffering

-  loop h

-

-  hSeek h AbsoluteSeek 0

-  hSetBuffering h LineBuffering

-  loop h

-

-  hSeek h AbsoluteSeek 0

-  hSetBuffering h (BlockBuffering (Just 83))

-  loop h

--- !!! testing hGetLine

-

-import System.IO

-

--- one version of 'cat'

-main = do

-  let loop h = do b <- hIsEOF h

-        	  if b then return ()

-		       else do l <- hGetLine h; putStrLn l; loop h

-  loop stdin 

-

-  h <- openFile "hGetLine001.hs" ReadMode

-

-  hSetBinaryMode stdout True

-

-  hSetBuffering h NoBuffering

-  loop h

-

-  hSeek h AbsoluteSeek 0

-  hSetBuffering h LineBuffering

-  loop h

-

-  hSeek h AbsoluteSeek 0

-  hSetBuffering h (BlockBuffering (Just 83))

-  loop h

--- !!! testing hGetLine

-

-import System.IO

-

--- one version of 'cat'

-main = do

-  let loop h = do b <- hIsEOF h

-        	  if b then return ()

-		       else do l <- hGetLine h; putStrLn l; loop h

-  loop stdin 

-

-  h <- openFile "hGetLine001.hs" ReadMode

-

-  hSetBinaryMode stdout True

-

-  hSetBuffering h NoBuffering

-  loop h

-

-  hSeek h AbsoluteSeek 0

-  hSetBuffering h LineBuffering

-  loop h

-

-  hSeek h AbsoluteSeek 0

-  hSetBuffering h (BlockBuffering (Just 83))

-  loop h

+-- !!! testing hGetLine
+
+import System.IO
+
+-- one version of 'cat'
+main = do
+  let loop h = do b <- hIsEOF h
+                  if b then return ()
+                       else do l <- hGetLine h; putStrLn l; loop h
+  loop stdin
+
+  h <- openFile "hGetLine001.hs" ReadMode
+
+  hSetBinaryMode stdout True
+
+  hSetBuffering h NoBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h LineBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h (BlockBuffering (Just 83))
+  loop h
+-- !!! testing hGetLine
+
+import System.IO
+
+-- one version of 'cat'
+main = do
+  let loop h = do b <- hIsEOF h
+                  if b then return ()
+                       else do l <- hGetLine h; putStrLn l; loop h
+  loop stdin
+
+  h <- openFile "hGetLine001.hs" ReadMode
+
+  hSetBinaryMode stdout True
+
+  hSetBuffering h NoBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h LineBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h (BlockBuffering (Just 83))
+  loop h
+-- !!! testing hGetLine
+
+import System.IO
+
+-- one version of 'cat'
+main = do
+  let loop h = do b <- hIsEOF h
+                  if b then return ()
+                       else do l <- hGetLine h; putStrLn l; loop h
+  loop stdin
+
+  h <- openFile "hGetLine001.hs" ReadMode
+
+  hSetBinaryMode stdout True
+
+  hSetBuffering h NoBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h LineBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h (BlockBuffering (Just 83))
+  loop h
+-- !!! testing hGetLine
+
+import System.IO
+
+-- one version of 'cat'
+main = do
+  let loop h = do b <- hIsEOF h
+                  if b then return ()
+                       else do l <- hGetLine h; putStrLn l; loop h
+  loop stdin
+
+  h <- openFile "hGetLine001.hs" ReadMode
+
+  hSetBinaryMode stdout True
+
+  hSetBuffering h NoBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h LineBuffering
+  loop h
+
+  hSeek h AbsoluteSeek 0
+  hSetBuffering h (BlockBuffering (Just 83))
+  loop h
diff --git a/libraries/base/tests/IO/hReady002.stdout b/libraries/base/tests/IO/hReady002.stdout
index 6217d00e10..af1186ad11 100644
--- a/libraries/base/tests/IO/hReady002.stdout
+++ b/libraries/base/tests/IO/hReady002.stdout
@@ -1 +1 @@
-Just False

+Just False
diff --git a/libraries/base/tests/IO/openFile003.stdout-mingw32 b/libraries/base/tests/IO/openFile003.stdout-mingw32
index bf99bcf80d..77ad0a860a 100644
--- a/libraries/base/tests/IO/openFile003.stdout-mingw32
+++ b/libraries/base/tests/IO/openFile003.stdout-mingw32
@@ -1,4 +1,4 @@
-Left openFile003Dir: openFile: permission denied (Permission denied)

-Left openFile003Dir: openFile: permission denied (Permission denied)

-Left openFile003Dir: openFile: permission denied (Permission denied)

-Left openFile003Dir: openFile: permission denied (Permission denied)

+Left openFile003Dir: openFile: permission denied (Permission denied)
+Left openFile003Dir: openFile: permission denied (Permission denied)
+Left openFile003Dir: openFile: permission denied (Permission denied)
+Left openFile003Dir: openFile: permission denied (Permission denied)
diff --git a/libraries/base/tests/Numeric/num009.stdout-i386-unknown-mingw32 b/libraries/base/tests/Numeric/num009.stdout-i386-unknown-mingw32
index d01a5a1d5d..32059747d5 100644
--- a/libraries/base/tests/Numeric/num009.stdout-i386-unknown-mingw32
+++ b/libraries/base/tests/Numeric/num009.stdout-i386-unknown-mingw32
@@ -1,16 +1,16 @@
-sind 1.0e20

--0.7304509250633894

--0.7469218912594929

-(-6579317027855829,-53)

-(-6727674302302237,-53)

-cosd 1.0e20

--0.6829651865754496

--0.6649117899070088

-(-6151603519536432,-53)

-(-5988992978518909,-53)

-tand 1.0e20

-1.0695287833425957

-1.123339821307656

-(4816729430123734,-52)

-(5059072800651599,-52)

-Done

+sind 1.0e20
+-0.7304509250633894
+-0.7469218912594929
+(-6579317027855829,-53)
+(-6727674302302237,-53)
+cosd 1.0e20
+-0.6829651865754496
+-0.6649117899070088
+(-6151603519536432,-53)
+(-5988992978518909,-53)
+tand 1.0e20
+1.0695287833425957
+1.123339821307656
+(4816729430123734,-52)
+(5059072800651599,-52)
+Done
diff --git a/testsuite/tests/arrows/should_fail/arrowfail002.stderr b/testsuite/tests/arrows/should_fail/arrowfail002.stderr
index d85fe84ef0..2bb46b971c 100644
--- a/testsuite/tests/arrows/should_fail/arrowfail002.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail002.stderr
@@ -1,2 +1,2 @@
-

-arrowfail002.hs:6:17: error: Variable not in scope: x :: Int

+
+arrowfail002.hs:6:17: error: Variable not in scope: x :: Int
diff --git a/testsuite/tests/cabal/cabal01/cabal01.stdout-mingw32 b/testsuite/tests/cabal/cabal01/cabal01.stdout-mingw32
index 647a2324b0..451ea849bb 100644
--- a/testsuite/tests/cabal/cabal01/cabal01.stdout-mingw32
+++ b/testsuite/tests/cabal/cabal01/cabal01.stdout-mingw32
@@ -1,12 +1,12 @@
-install1:

-bin

-test-1.0

-install2:

-bin

-test-1.0

-dist:

-build

-package.conf.inplace

-setup-config

-src

-test-1.0.tar.gz

+install1:
+bin
+test-1.0
+install2:
+bin
+test-1.0
+dist:
+build
+package.conf.inplace
+setup-config
+src
+test-1.0.tar.gz
diff --git a/testsuite/tests/concurrent/should_run/conc041.stdout b/testsuite/tests/concurrent/should_run/conc041.stdout
index a84f0c9779..f3a08f7dec 100644
--- a/testsuite/tests/concurrent/should_run/conc041.stdout
+++ b/testsuite/tests/concurrent/should_run/conc041.stdout
@@ -1,2 +1,2 @@
-Before

-After

+Before
+After
diff --git a/testsuite/tests/concurrent/should_run/conc042.stdout b/testsuite/tests/concurrent/should_run/conc042.stdout
index 6fea5e3fe9..c4b837f21b 100644
--- a/testsuite/tests/concurrent/should_run/conc042.stdout
+++ b/testsuite/tests/concurrent/should_run/conc042.stdout
@@ -1,2 +1,2 @@
-Before

-After 42

+Before
+After 42
diff --git a/testsuite/tests/concurrent/should_run/conc043.stdout b/testsuite/tests/concurrent/should_run/conc043.stdout
index 8b2ff8961d..b2eab3d345 100644
--- a/testsuite/tests/concurrent/should_run/conc043.stdout
+++ b/testsuite/tests/concurrent/should_run/conc043.stdout
@@ -1,2 +1,2 @@
-Before

-After 17

+Before
+After 17
diff --git a/testsuite/tests/concurrent/should_run/conc044.stdout b/testsuite/tests/concurrent/should_run/conc044.stdout
index 8b2ff8961d..b2eab3d345 100644
--- a/testsuite/tests/concurrent/should_run/conc044.stdout
+++ b/testsuite/tests/concurrent/should_run/conc044.stdout
@@ -1,2 +1,2 @@
-Before

-After 17

+Before
+After 17
diff --git a/testsuite/tests/concurrent/should_run/conc045.stdout b/testsuite/tests/concurrent/should_run/conc045.stdout
index 31640611f4..cf3f4e0651 100644
--- a/testsuite/tests/concurrent/should_run/conc045.stdout
+++ b/testsuite/tests/concurrent/should_run/conc045.stdout
@@ -1,2 +1,2 @@
-Before

-After 2000 , 2001

+Before
+After 2000 , 2001
diff --git a/testsuite/tests/deSugar/should_run/T3382.stdout b/testsuite/tests/deSugar/should_run/T3382.stdout
index a92f13b57a..68adc14c7a 100644
--- a/testsuite/tests/deSugar/should_run/T3382.stdout
+++ b/testsuite/tests/deSugar/should_run/T3382.stdout
@@ -1,2 +1,2 @@
-"correct"

-"false"

+"correct"
+"false"
diff --git a/testsuite/tests/deriving/should_fail/T2604.stderr-7.0 b/testsuite/tests/deriving/should_fail/T2604.stderr-7.0
deleted file mode 100644
index aa996e0f87..0000000000
--- a/testsuite/tests/deriving/should_fail/T2604.stderr-7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-

-T2604.hs:7:35:

-    Can't make a derived instance of `Typeable (DList a)':

-      You need -XDeriveDataTypeable to derive an instance for this class

-    In the data type declaration for `DList'

-

-T2604.hs:9:38:

-    Can't make a derived instance of `Typeable (NList a)'

-      (even with cunning newtype deriving):
-      You need -XDeriveDataTypeable to derive an instance for this class

-    In the newtype declaration for `NList'

diff --git a/testsuite/tests/deriving/should_fail/T9968a.stderr b/testsuite/tests/deriving/should_fail/T9968a.stderr
index 5d7802f7d3..9f52b2efa9 100644
--- a/testsuite/tests/deriving/should_fail/T9968a.stderr
+++ b/testsuite/tests/deriving/should_fail/T9968a.stderr
@@ -1,6 +1,6 @@
-

-T9968a.hs:8:13: error:

-    • Can't make a derived instance of ‘Bifunctor Blah’:

-        ‘Bifunctor’ is not a standard derivable class (Eq, Show, etc.)

-        The last argument of class ‘Bifunctor’ does not have kind * or (* -> *)

-    • In the data declaration for ‘Blah’

+
+T9968a.hs:8:13: error:
+    • Can't make a derived instance of ‘Bifunctor Blah’:
+        ‘Bifunctor’ is not a standard derivable class (Eq, Show, etc.)
+        The last argument of class ‘Bifunctor’ does not have kind * or (* -> *)
+    • In the data declaration for ‘Blah’
diff --git a/testsuite/tests/deriving/should_fail/drvfail006.stderr b/testsuite/tests/deriving/should_fail/drvfail006.stderr
index 018291b6bb..3968d97d40 100644
--- a/testsuite/tests/deriving/should_fail/drvfail006.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail006.stderr
@@ -1,6 +1,6 @@
-

-drvfail006.hs:9:45:

-    Can't make a derived instance of `MonadState T'

-      (even with cunning newtype deriving):

-      `MonadState' does not have arity 1

-    In the newtype declaration for `T'

+
+drvfail006.hs:9:45:
+    Can't make a derived instance of `MonadState T'
+      (even with cunning newtype deriving):
+      `MonadState' does not have arity 1
+    In the newtype declaration for `T'
diff --git a/testsuite/tests/deriving/should_run/T4136.stdout b/testsuite/tests/deriving/should_run/T4136.stdout
index 05a108c942..6ca2fd2379 100644
--- a/testsuite/tests/deriving/should_run/T4136.stdout
+++ b/testsuite/tests/deriving/should_run/T4136.stdout
@@ -1,2 +1,2 @@
-show (:=:) = (:=:)

-read (show (:=:)) :: T = (:=:)

+show (:=:) = (:=:)
+read (show (:=:)) :: T = (:=:)
diff --git a/testsuite/tests/deriving/should_run/drvrun019.stdout b/testsuite/tests/deriving/should_run/drvrun019.stdout
index f165e2102f..d6459e0054 100644
--- a/testsuite/tests/deriving/should_run/drvrun019.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun019.stdout
@@ -1 +1 @@
-xxx

+xxx
diff --git a/testsuite/tests/ffi/should_run/T1288_c.c b/testsuite/tests/ffi/should_run/T1288_c.c
index f240d29529..4ea5b13949 100644
--- a/testsuite/tests/ffi/should_run/T1288_c.c
+++ b/testsuite/tests/ffi/should_run/T1288_c.c
@@ -1,6 +1,6 @@
-#include <stdio.h>

-

-void __attribute__((stdcall)) test(int arg)

-{

-   printf("The argument passed was %i\n", arg );

-}

+#include <stdio.h>
+
+void __attribute__((stdcall)) test(int arg)
+{
+   printf("The argument passed was %i\n", arg );
+}
diff --git a/testsuite/tests/ffi/should_run/T1288_ghci_c.c b/testsuite/tests/ffi/should_run/T1288_ghci_c.c
index f240d29529..4ea5b13949 100644
--- a/testsuite/tests/ffi/should_run/T1288_ghci_c.c
+++ b/testsuite/tests/ffi/should_run/T1288_ghci_c.c
@@ -1,6 +1,6 @@
-#include <stdio.h>

-

-void __attribute__((stdcall)) test(int arg)

-{

-   printf("The argument passed was %i\n", arg );

-}

+#include <stdio.h>
+
+void __attribute__((stdcall)) test(int arg)
+{
+   printf("The argument passed was %i\n", arg );
+}
diff --git a/testsuite/tests/ffi/should_run/T2276_c.c b/testsuite/tests/ffi/should_run/T2276_c.c
index f240d29529..4ea5b13949 100644
--- a/testsuite/tests/ffi/should_run/T2276_c.c
+++ b/testsuite/tests/ffi/should_run/T2276_c.c
@@ -1,6 +1,6 @@
-#include <stdio.h>

-

-void __attribute__((stdcall)) test(int arg)

-{

-   printf("The argument passed was %i\n", arg );

-}

+#include <stdio.h>
+
+void __attribute__((stdcall)) test(int arg)
+{
+   printf("The argument passed was %i\n", arg );
+}
diff --git a/testsuite/tests/ffi/should_run/T2276_ghci_c.c b/testsuite/tests/ffi/should_run/T2276_ghci_c.c
index f240d29529..4ea5b13949 100644
--- a/testsuite/tests/ffi/should_run/T2276_ghci_c.c
+++ b/testsuite/tests/ffi/should_run/T2276_ghci_c.c
@@ -1,6 +1,6 @@
-#include <stdio.h>

-

-void __attribute__((stdcall)) test(int arg)

-{

-   printf("The argument passed was %i\n", arg );

-}

+#include <stdio.h>
+
+void __attribute__((stdcall)) test(int arg)
+{
+   printf("The argument passed was %i\n", arg );
+}
diff --git a/testsuite/tests/ffi/should_run/ffi012.stdout b/testsuite/tests/ffi/should_run/ffi012.stdout
index b384fe2adf..1b8c42d40c 100644
--- a/testsuite/tests/ffi/should_run/ffi012.stdout
+++ b/testsuite/tests/ffi/should_run/ffi012.stdout
@@ -1,4 +1,4 @@
-84

-84

-84.0

-84.0

+84
+84
+84.0
+84.0
diff --git a/testsuite/tests/ffi/should_run/ffi014_cbits.c b/testsuite/tests/ffi/should_run/ffi014_cbits.c
index 0cf96d5dc6..0e2fc7d509 100644
--- a/testsuite/tests/ffi/should_run/ffi014_cbits.c
+++ b/testsuite/tests/ffi/should_run/ffi014_cbits.c
@@ -1,6 +1,6 @@
-#include "ffi014_cbits.h"

-

-void callC( FUNC* f) {

-   int i;

-   for(i=0;i<1000;i++) f();

-}

+#include "ffi014_cbits.h"
+
+void callC( FUNC* f) {
+   int i;
+   for(i=0;i<1000;i++) f();
+}
diff --git a/testsuite/tests/ffi/should_run/ffi014_cbits.h b/testsuite/tests/ffi/should_run/ffi014_cbits.h
index d0d8517ca5..f81a6fff2d 100644
--- a/testsuite/tests/ffi/should_run/ffi014_cbits.h
+++ b/testsuite/tests/ffi/should_run/ffi014_cbits.h
@@ -1,3 +1,3 @@
-typedef void FUNC();

-

-void callC( FUNC* f);

+typedef void FUNC();
+
+void callC( FUNC* f);
diff --git a/testsuite/tests/gadt/T3163.stderr b/testsuite/tests/gadt/T3163.stderr
index f298192647..2ee6095e1b 100644
--- a/testsuite/tests/gadt/T3163.stderr
+++ b/testsuite/tests/gadt/T3163.stderr
@@ -1,5 +1,5 @@
-

-T3163.hs:8:5: error:

-    • Illegal polymorphic type: forall s. s

-    • In the definition of data constructor ‘Unreached’

-      In the data type declaration for ‘Taker’

+
+T3163.hs:8:5: error:
+    • Illegal polymorphic type: forall s. s
+    • In the definition of data constructor ‘Unreached’
+      In the data type declaration for ‘Taker’
diff --git a/testsuite/tests/generics/T5462Yes1.stdout b/testsuite/tests/generics/T5462Yes1.stdout
index 6a2dc672a6..b44c6caaff 100644
--- a/testsuite/tests/generics/T5462Yes1.stdout
+++ b/testsuite/tests/generics/T5462Yes1.stdout
@@ -1 +1 @@
-(True,[A1],False,B2 "hello" B1,[B1,B2 A1 B1,B2 A1 (B2 A1 B1)],False,C2 "hello" C1,True,E1 ["hello"])

+(True,[A1],False,B2 "hello" B1,[B1,B2 A1 B1,B2 A1 (B2 A1 B1)],False,C2 "hello" C1,True,E1 ["hello"])
diff --git a/testsuite/tests/ghc-api/annotations/T10278.stderr b/testsuite/tests/ghc-api/annotations/T10278.stderr
index 6523039386..7da1d8ab08 100644
--- a/testsuite/tests/ghc-api/annotations/T10278.stderr
+++ b/testsuite/tests/ghc-api/annotations/T10278.stderr
@@ -1,12 +1,12 @@
-

-Test10278.hs:9:27: error:

-    Not in scope: type constructor or class ‘Tower’

-

-Test10278.hs:9:39: error:

-    Not in scope: type constructor or class ‘Tower’

-

-Test10278.hs:10:34: error:

-    Not in scope: type constructor or class ‘Tower’

-

-Test10278.hs:10:46: error:

-    Not in scope: type constructor or class ‘Tower’

+
+Test10278.hs:9:27: error:
+    Not in scope: type constructor or class ‘Tower’
+
+Test10278.hs:9:39: error:
+    Not in scope: type constructor or class ‘Tower’
+
+Test10278.hs:10:34: error:
+    Not in scope: type constructor or class ‘Tower’
+
+Test10278.hs:10:46: error:
+    Not in scope: type constructor or class ‘Tower’
diff --git a/testsuite/tests/ghci.debugger/scripts/print026.stdout b/testsuite/tests/ghci.debugger/scripts/print026.stdout
index 25abae22d8..decc3dfb6d 100644
--- a/testsuite/tests/ghci.debugger/scripts/print026.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print026.stdout
@@ -1,6 +1,6 @@
-fromList "abc"

-l = Data.Sequence.Seq (Data.Sequence.Deep

-                         3 (Data.Sequence.One (Data.Sequence.Elem 'a')) Data.Sequence.Empty

-                         (Data.Sequence.Two

-                            (Data.Sequence.Elem 'b') (Data.Sequence.Elem 'c')))

-l = fromList "abc"

+fromList "abc"
+l = Data.Sequence.Seq (Data.Sequence.Deep
+                         3 (Data.Sequence.One (Data.Sequence.Elem 'a')) Data.Sequence.Empty
+                         (Data.Sequence.Two
+                            (Data.Sequence.Elem 'b') (Data.Sequence.Elem 'c')))
+l = fromList "abc"
diff --git a/testsuite/tests/ghci/prog012/prog012.stderr b/testsuite/tests/ghci/prog012/prog012.stderr
index 40c61dabaa..71d2bd385a 100644
--- a/testsuite/tests/ghci/prog012/prog012.stderr
+++ b/testsuite/tests/ghci/prog012/prog012.stderr
@@ -1,2 +1,2 @@
-

-Bar.hs:3:7: error: Variable not in scope: nonexistent

+
+Bar.hs:3:7: error: Variable not in scope: nonexistent
diff --git a/testsuite/tests/ghci/scripts/T11098.script b/testsuite/tests/ghci/scripts/T11098.script
index ad42ba5307..fc0fbe8c9e 100644
--- a/testsuite/tests/ghci/scripts/T11098.script
+++ b/testsuite/tests/ghci/scripts/T11098.script
@@ -1,13 +1,13 @@
--- See Trac #11098

-

-:set -XTemplateHaskell

-:set -XNamedWildCards

-:set -XScopedTypeVariables

-

-:m +Data.Char

-:m +Language.Haskell.TH

-

-runQ [d|foo :: a -> a;foo x = x|]

-runQ $ fmap (filter (not . isDigit) . show) [d|foo :: _a -> _a; foo x = x|]

-runQ [d|foo :: forall _a . _a -> _a ; foo x = x|]

-

+-- See Trac #11098
+
+:set -XTemplateHaskell
+:set -XNamedWildCards
+:set -XScopedTypeVariables
+
+:m +Data.Char
+:m +Language.Haskell.TH
+
+runQ [d|foo :: a -> a;foo x = x|]
+runQ $ fmap (filter (not . isDigit) . show) [d|foo :: _a -> _a; foo x = x|]
+runQ [d|foo :: forall _a . _a -> _a ; foo x = x|]
+
diff --git a/testsuite/tests/ghci/scripts/T2816.stderr b/testsuite/tests/ghci/scripts/T2816.stderr
index bc9fa44254..e41f25a5d2 100644
--- a/testsuite/tests/ghci/scripts/T2816.stderr
+++ b/testsuite/tests/ghci/scripts/T2816.stderr
@@ -1,2 +1,2 @@
-

-<interactive>:1:1: error: Variable not in scope: α

+
+<interactive>:1:1: error: Variable not in scope: α
diff --git a/testsuite/tests/ghci/scripts/T4127.script b/testsuite/tests/ghci/scripts/T4127.script
index 03eb490544..6c89f5b533 100644
--- a/testsuite/tests/ghci/scripts/T4127.script
+++ b/testsuite/tests/ghci/scripts/T4127.script
@@ -1,3 +1,3 @@
-:set -XTemplateHaskell

-Language.Haskell.TH.runQ [d| instance Monad ((,) a) where { return  = undefined; (>>=) = undefined } |]

-

+:set -XTemplateHaskell
+Language.Haskell.TH.runQ [d| instance Monad ((,) a) where { return  = undefined; (>>=) = undefined } |]
+
diff --git a/testsuite/tests/ghci/scripts/T4127a.script b/testsuite/tests/ghci/scripts/T4127a.script
index 3712c6a184..834e147698 100644
--- a/testsuite/tests/ghci/scripts/T4127a.script
+++ b/testsuite/tests/ghci/scripts/T4127a.script
@@ -1,2 +1,2 @@
-:set -XTemplateHaskell

-Language.Haskell.TH.runQ $ [d| f = undefined; class Foo x where {  f :: x -> x }; instance Foo Int where { f = id } |]

+:set -XTemplateHaskell
+Language.Haskell.TH.runQ $ [d| f = undefined; class Foo x where {  f :: x -> x }; instance Foo Int where { f = id } |]
diff --git a/testsuite/tests/ghci/scripts/T5566.stdout b/testsuite/tests/ghci/scripts/T5566.stdout
index ea12c09ff7..f71dd7c31c 100644
--- a/testsuite/tests/ghci/scripts/T5566.stdout
+++ b/testsuite/tests/ghci/scripts/T5566.stdout
@@ -1,3 +1,3 @@
-0

-D

-"D"

+0
+D
+"D"
diff --git a/testsuite/tests/ghci/scripts/ghci019.script b/testsuite/tests/ghci/scripts/ghci019.script
index b74e7c5ab9..822be13edb 100644
--- a/testsuite/tests/ghci/scripts/ghci019.script
+++ b/testsuite/tests/ghci/scripts/ghci019.script
@@ -1,2 +1,2 @@
-:l ghci019

-:i Foo

+:l ghci019
+:i Foo
diff --git a/testsuite/tests/ghci/scripts/ghci023.ghci b/testsuite/tests/ghci/scripts/ghci023.ghci
index 83363a3ddc..a9d38d7a5b 100644
--- a/testsuite/tests/ghci/scripts/ghci023.ghci
+++ b/testsuite/tests/ghci/scripts/ghci023.ghci
@@ -1,10 +1,10 @@
-:{

-  let { a = True

-      ; b = False

-      }

-:}

-print (a,b)

-:{

-:type

-  id

-:}

+:{
+  let { a = True
+      ; b = False
+      }
+:}
+print (a,b)
+:{
+:type
+  id
+:}
diff --git a/testsuite/tests/ghci/scripts/ghci038.stderr b/testsuite/tests/ghci/scripts/ghci038.stderr
index c2047d8042..ebd699a68f 100644
--- a/testsuite/tests/ghci/scripts/ghci038.stderr
+++ b/testsuite/tests/ghci/scripts/ghci038.stderr
@@ -1,4 +1,4 @@
-

-<interactive>:1:1: error: Variable not in scope: map

-

-<interactive>:1:1: error: Variable not in scope: x

+
+<interactive>:1:1: error: Variable not in scope: map
+
+<interactive>:1:1: error: Variable not in scope: x
diff --git a/testsuite/tests/ghci/scripts/ghci044.stdout b/testsuite/tests/ghci/scripts/ghci044.stdout
index eadd22f710..c8eb8f6241 100644
--- a/testsuite/tests/ghci/scripts/ghci044.stdout
+++ b/testsuite/tests/ghci/scripts/ghci044.stdout
@@ -1,4 +1,4 @@
-"First"

-"First"

-"First"

-"Fourth"

+"First"
+"First"
+"First"
+"Fourth"
diff --git a/testsuite/tests/indexed-types/should_compile/T11361a.stderr b/testsuite/tests/indexed-types/should_compile/T11361a.stderr
index f7052aecb3..4eb8bf6426 100644
--- a/testsuite/tests/indexed-types/should_compile/T11361a.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T11361a.stderr
@@ -1,5 +1,5 @@
-

-T11361a.hs:7:3: error:

-    • Kind mis-match on LHS of default declaration for ‘F’

-    • In the default type instance declaration for ‘F’

-      In the class declaration for ‘C’

+
+T11361a.hs:7:3: error:
+    • Kind mis-match on LHS of default declaration for ‘F’
+    • In the default type instance declaration for ‘F’
+      In the class declaration for ‘C’
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr
index 602fc3d83c..ef6b3181e7 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr
@@ -1,6 +1,6 @@
-

-SimpleFail15.hs:5:8: error:

-    • Illegal qualified type: (a ~ b) => t

-      Perhaps you intended to use RankNTypes or Rank2Types

-    • In the type signature:

-        foo :: (a, b) -> (a ~ b => t) -> (a, b)

+
+SimpleFail15.hs:5:8: error:
+    • Illegal qualified type: (a ~ b) => t
+      Perhaps you intended to use RankNTypes or Rank2Types
+    • In the type signature:
+        foo :: (a, b) -> (a ~ b => t) -> (a, b)
diff --git a/testsuite/tests/indexed-types/should_fail/T10899.stderr b/testsuite/tests/indexed-types/should_fail/T10899.stderr
index ae15f82128..925e4348fe 100644
--- a/testsuite/tests/indexed-types/should_fail/T10899.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T10899.stderr
@@ -1,4 +1,4 @@
-

-T10899.hs:7:3: error:

-    • Illegal polymorphic type: forall (m :: * -> *). m a

-    • In the class declaration for ‘C’

+
+T10899.hs:7:3: error:
+    • Illegal polymorphic type: forall (m :: * -> *). m a
+    • In the class declaration for ‘C’
diff --git a/testsuite/tests/indexed-types/should_fail/T11136.stderr b/testsuite/tests/indexed-types/should_fail/T11136.stderr
index 12a4ec0662..f90ef74149 100644
--- a/testsuite/tests/indexed-types/should_fail/T11136.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T11136.stderr
@@ -1,5 +1,5 @@
-

-T11136.hs:7:3: error:

-    • Number of parameters must match family declaration; expected 1

-    • In the default type instance declaration for ‘D’

-      In the class declaration for ‘C’

+
+T11136.hs:7:3: error:
+    • Number of parameters must match family declaration; expected 1
+    • In the default type instance declaration for ‘D’
+      In the class declaration for ‘C’
diff --git a/testsuite/tests/mdo/should_run/mdorun003.stdout b/testsuite/tests/mdo/should_run/mdorun003.stdout
index 912f3a2a53..7d7684f42a 100644
--- a/testsuite/tests/mdo/should_run/mdorun003.stdout
+++ b/testsuite/tests/mdo/should_run/mdorun003.stdout
@@ -1,2 +1,2 @@
-"x"

-(42,())

+"x"
+(42,())
diff --git a/testsuite/tests/module/mod110.stderr b/testsuite/tests/module/mod110.stderr
index 815da10602..6a7ade9c44 100644
--- a/testsuite/tests/module/mod110.stderr
+++ b/testsuite/tests/module/mod110.stderr
@@ -1,7 +1,7 @@
-

-mod110.hs:11:10: error:

-    Ambiguous occurrence ‘Eq’

-    It could refer to either ‘Prelude.Eq’,

-                             imported from ‘Prelude’ at mod110.hs:4:1-14

-                             (and originally defined in ‘GHC.Classes’)

-                          or ‘M.Eq’, defined at mod110.hs:7:1

+
+mod110.hs:11:10: error:
+    Ambiguous occurrence ‘Eq’
+    It could refer to either ‘Prelude.Eq’,
+                             imported from ‘Prelude’ at mod110.hs:4:1-14
+                             (and originally defined in ‘GHC.Classes’)
+                          or ‘M.Eq’, defined at mod110.hs:7:1
diff --git a/testsuite/tests/module/mod120.stderr b/testsuite/tests/module/mod120.stderr
index 0052dcc79a..235bb5b7eb 100644
--- a/testsuite/tests/module/mod120.stderr
+++ b/testsuite/tests/module/mod120.stderr
@@ -1,2 +1,2 @@
-

-mod120.hs:5:5: error: Data constructor not in scope: Foo

+
+mod120.hs:5:5: error: Data constructor not in scope: Foo
diff --git a/testsuite/tests/module/mod138.stderr b/testsuite/tests/module/mod138.stderr
index 4c24e4063b..affabd924d 100644
--- a/testsuite/tests/module/mod138.stderr
+++ b/testsuite/tests/module/mod138.stderr
@@ -1,2 +1,2 @@
-

-mod138.hs:7:5: error: Variable not in scope: isLatin1

+
+mod138.hs:7:5: error: Variable not in scope: isLatin1
diff --git a/testsuite/tests/module/mod151.stderr b/testsuite/tests/module/mod151.stderr
index 3feab8e7ba..265ad86031 100644
--- a/testsuite/tests/module/mod151.stderr
+++ b/testsuite/tests/module/mod151.stderr
@@ -1,7 +1,7 @@
-

-mod151.hs:2:20: error:

-    Ambiguous occurrence ‘id’

-    It could refer to either ‘Prelude.id’,

-                             imported from ‘Prelude’ at mod151.hs:2:8

-                             (and originally defined in ‘GHC.Base’)

-                          or ‘M.id’, defined at mod151.hs:2:30

+
+mod151.hs:2:20: error:
+    Ambiguous occurrence ‘id’
+    It could refer to either ‘Prelude.id’,
+                             imported from ‘Prelude’ at mod151.hs:2:8
+                             (and originally defined in ‘GHC.Base’)
+                          or ‘M.id’, defined at mod151.hs:2:30
diff --git a/testsuite/tests/module/mod152.stderr b/testsuite/tests/module/mod152.stderr
index d0106d44a6..769b45b1c5 100644
--- a/testsuite/tests/module/mod152.stderr
+++ b/testsuite/tests/module/mod152.stderr
@@ -1,7 +1,7 @@
-

-mod152.hs:2:26: error:

-    Ambiguous occurrence ‘id’

-    It could refer to either ‘Prelude.id’,

-                             imported from ‘Prelude’ at mod152.hs:2:8

-                             (and originally defined in ‘GHC.Base’)

-                          or ‘M.id’, defined at mod152.hs:2:36

+
+mod152.hs:2:26: error:
+    Ambiguous occurrence ‘id’
+    It could refer to either ‘Prelude.id’,
+                             imported from ‘Prelude’ at mod152.hs:2:8
+                             (and originally defined in ‘GHC.Base’)
+                          or ‘M.id’, defined at mod152.hs:2:36
diff --git a/testsuite/tests/module/mod153.stderr b/testsuite/tests/module/mod153.stderr
index 8f45a03063..51f14a486c 100644
--- a/testsuite/tests/module/mod153.stderr
+++ b/testsuite/tests/module/mod153.stderr
@@ -1,7 +1,7 @@
-

-mod153.hs:2:11: error:

-    Ambiguous occurrence ‘id’

-    It could refer to either ‘Prelude.id’,

-                             imported from ‘Prelude’ at mod153.hs:2:8

-                             (and originally defined in ‘GHC.Base’)

-                          or ‘M.id’, defined at mod153.hs:2:21

+
+mod153.hs:2:11: error:
+    Ambiguous occurrence ‘id’
+    It could refer to either ‘Prelude.id’,
+                             imported from ‘Prelude’ at mod153.hs:2:8
+                             (and originally defined in ‘GHC.Base’)
+                          or ‘M.id’, defined at mod153.hs:2:21
diff --git a/testsuite/tests/module/mod158.stderr b/testsuite/tests/module/mod158.stderr
index afe0deb7ba..f59b91a29b 100644
--- a/testsuite/tests/module/mod158.stderr
+++ b/testsuite/tests/module/mod158.stderr
@@ -1,3 +1,3 @@
-

-mod158.hs:12:5: error: Data constructor not in scope: C

-exit(1)

+
+mod158.hs:12:5: error: Data constructor not in scope: C
+exit(1)
diff --git a/testsuite/tests/module/mod48.stderr b/testsuite/tests/module/mod48.stderr
index 3800615dfc..d2e2652403 100644
--- a/testsuite/tests/module/mod48.stderr
+++ b/testsuite/tests/module/mod48.stderr
@@ -1,4 +1,4 @@
-

-mod48.hs:5:3: error:

-    Pattern bindings (except simple variables) not allowed in class declaration:

-      (x, y) = error "foo"

+
+mod48.hs:5:3: error:
+    Pattern bindings (except simple variables) not allowed in class declaration:
+      (x, y) = error "foo"
diff --git a/testsuite/tests/module/mod98.stderr b/testsuite/tests/module/mod98.stderr
index 86a970ccdf..0cfe7fc7eb 100644
--- a/testsuite/tests/module/mod98.stderr
+++ b/testsuite/tests/module/mod98.stderr
@@ -1,4 +1,4 @@
-

-mod98.hs:3:1: error:

-    Invalid type signature: M.x :: ...

-    Should be of form <variable> :: <type>

+
+mod98.hs:3:1: error:
+    Invalid type signature: M.x :: ...
+    Should be of form <variable> :: <type>
diff --git a/testsuite/tests/parser/should_fail/NoPatternSynonyms.stderr b/testsuite/tests/parser/should_fail/NoPatternSynonyms.stderr
index ebb15492a1..b4ca84e3b3 100644
--- a/testsuite/tests/parser/should_fail/NoPatternSynonyms.stderr
+++ b/testsuite/tests/parser/should_fail/NoPatternSynonyms.stderr
@@ -1,4 +1,4 @@
-

-NoPatternSynonyms.hs:3:1: error:

-    Invalid type signature: pattern P :: ...

-    Perhaps you meant to use PatternSynonyms?

+
+NoPatternSynonyms.hs:3:1: error:
+    Invalid type signature: pattern P :: ...
+    Perhaps you meant to use PatternSynonyms?
diff --git a/testsuite/tests/parser/should_fail/T3811.stderr b/testsuite/tests/parser/should_fail/T3811.stderr
index e945f51e5e..f38556cf7c 100644
--- a/testsuite/tests/parser/should_fail/T3811.stderr
+++ b/testsuite/tests/parser/should_fail/T3811.stderr
@@ -1,4 +1,4 @@
-

-T3811.hs:4:1: error:

-    Invalid type signature: f x :: ...

-    Should be of form <variable> :: <type>

+
+T3811.hs:4:1: error:
+    Invalid type signature: f x :: ...
+    Should be of form <variable> :: <type>
diff --git a/testsuite/tests/parser/should_fail/readFail001.stderr b/testsuite/tests/parser/should_fail/readFail001.stderr
index 64b8657afd..6425d16c49 100644
--- a/testsuite/tests/parser/should_fail/readFail001.stderr
+++ b/testsuite/tests/parser/should_fail/readFail001.stderr
@@ -1,18 +1,18 @@
-

-readFail001.hs:25:11: error:

-    The fixity signature for ‘+#’ lacks an accompanying binding

-

-readFail001.hs:38:32: error:

-    Not in scope: type constructor or class ‘Leaf’

-    A data constructor of that name is in scope; did you mean DataKinds?

-

-readFail001.hs:38:41: error:

-    Not in scope: type constructor or class ‘Leaf’

-    A data constructor of that name is in scope; did you mean DataKinds?

-

-readFail001.hs:107:30: error: Not in scope: data constructor ‘Foo’

-

-readFail001.hs:107:42: error: Not in scope: data constructor ‘Bar’

-

-readFail001.hs:112:23: error:

-    Not in scope: type constructor or class ‘Foo’

+
+readFail001.hs:25:11: error:
+    The fixity signature for ‘+#’ lacks an accompanying binding
+
+readFail001.hs:38:32: error:
+    Not in scope: type constructor or class ‘Leaf’
+    A data constructor of that name is in scope; did you mean DataKinds?
+
+readFail001.hs:38:41: error:
+    Not in scope: type constructor or class ‘Leaf’
+    A data constructor of that name is in scope; did you mean DataKinds?
+
+readFail001.hs:107:30: error: Not in scope: data constructor ‘Foo’
+
+readFail001.hs:107:42: error: Not in scope: data constructor ‘Bar’
+
+readFail001.hs:112:23: error:
+    Not in scope: type constructor or class ‘Foo’
diff --git a/testsuite/tests/parser/should_fail/readFail031.stderr b/testsuite/tests/parser/should_fail/readFail031.stderr
index 1ab3923256..75c2b879a4 100644
--- a/testsuite/tests/parser/should_fail/readFail031.stderr
+++ b/testsuite/tests/parser/should_fail/readFail031.stderr
@@ -1,4 +1,4 @@
-

-readFail031.hs:4:3: error:

-    Invalid type signature: (:+) :: ...

-    Should be of form <variable> :: <type>

+
+readFail031.hs:4:3: error:
+    Invalid type signature: (:+) :: ...
+    Should be of form <variable> :: <type>
diff --git a/testsuite/tests/parser/should_fail/readFail042.stderr b/testsuite/tests/parser/should_fail/readFail042.stderr
index 23e82c5e10..79d1016e78 100644
--- a/testsuite/tests/parser/should_fail/readFail042.stderr
+++ b/testsuite/tests/parser/should_fail/readFail042.stderr
@@ -1,8 +1,8 @@
-

-readFail042.hs:9:9: error:

-    Unexpected transform statement in a list comprehension

-    Use TransformListComp

-

-readFail042.hs:9:9: error:

-    Unexpected transform statement in a list comprehension

-    Use TransformListComp

+
+readFail042.hs:9:9: error:
+    Unexpected transform statement in a list comprehension
+    Use TransformListComp
+
+readFail042.hs:9:9: error:
+    Unexpected transform statement in a list comprehension
+    Use TransformListComp
diff --git a/testsuite/tests/parser/should_fail/readFail043.stderr b/testsuite/tests/parser/should_fail/readFail043.stderr
index b72575d09f..803bffe7bb 100644
--- a/testsuite/tests/parser/should_fail/readFail043.stderr
+++ b/testsuite/tests/parser/should_fail/readFail043.stderr
@@ -1,12 +1,12 @@
-

-readFail043.hs:9:9: error:

-    Unexpected transform statement in a list comprehension

-    Use TransformListComp

-

-readFail043.hs:9:9: error:

-    Unexpected transform statement in a list comprehension

-    Use TransformListComp

-

-readFail043.hs:9:9: error:

-    Unexpected transform statement in a list comprehension

-    Use TransformListComp

+
+readFail043.hs:9:9: error:
+    Unexpected transform statement in a list comprehension
+    Use TransformListComp
+
+readFail043.hs:9:9: error:
+    Unexpected transform statement in a list comprehension
+    Use TransformListComp
+
+readFail043.hs:9:9: error:
+    Unexpected transform statement in a list comprehension
+    Use TransformListComp
diff --git a/testsuite/tests/parser/unicode/T2302.stderr b/testsuite/tests/parser/unicode/T2302.stderr
index 985c8dd7d6..e56021f5e5 100644
--- a/testsuite/tests/parser/unicode/T2302.stderr
+++ b/testsuite/tests/parser/unicode/T2302.stderr
@@ -1,2 +1,2 @@
-

-T2302.hs:2:5: error: Data constructor not in scope: À

+
+T2302.hs:2:5: error: Data constructor not in scope: À
diff --git a/testsuite/tests/partial-sigs/should_compile/T10519.stderr b/testsuite/tests/partial-sigs/should_compile/T10519.stderr
index d34b06227a..603d0bc929 100644
--- a/testsuite/tests/partial-sigs/should_compile/T10519.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/T10519.stderr
@@ -1,5 +1,5 @@
-

-T10519.hs:5:18: warning:

-    Found constraint wildcard ‘_’ standing for ‘Eq a’

-    In the type signature:

-      foo :: forall a. _ => a -> a -> Bool

+
+T10519.hs:5:18: warning:
+    Found constraint wildcard ‘_’ standing for ‘Eq a’
+    In the type signature:
+      foo :: forall a. _ => a -> a -> Bool
diff --git a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSplice2.stderr b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSplice2.stderr
index 05994d76f9..70bf6384d4 100644
--- a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSplice2.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardInTypeSplice2.stderr
@@ -1,5 +1,5 @@
-

-ExtraConstraintsWildcardInTypeSplice2.hs:6:12: error:

-    Wildcard ‘_’ not allowed

-      in the spliced type ‘_’

-    In the untyped splice: $wildCardT

+
+ExtraConstraintsWildcardInTypeSplice2.hs:6:12: error:
+    Wildcard ‘_’ not allowed
+      in the spliced type ‘_’
+    In the untyped splice: $wildCardT
diff --git a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardNotEnabled.stderr b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardNotEnabled.stderr
index 3cd4150d02..d1dee083dd 100644
--- a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardNotEnabled.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardNotEnabled.stderr
@@ -1,6 +1,6 @@
-

-ExtraConstraintsWildcardNotEnabled.hs:4:10: error:

-    Found constraint wildcard ‘_’ standing for ‘Show a’

-    To use the inferred type, enable PartialTypeSignatures

-    In the type signature:

-      show' :: _ => a -> String

+
+ExtraConstraintsWildcardNotEnabled.hs:4:10: error:
+    Found constraint wildcard ‘_’ standing for ‘Show a’
+    To use the inferred type, enable PartialTypeSignatures
+    In the type signature:
+      show' :: _ => a -> String
diff --git a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardNotLast.stderr b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardNotLast.stderr
index 3ffcb187ac..86e5805a91 100644
--- a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardNotLast.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardNotLast.stderr
@@ -1,6 +1,6 @@
-

-ExtraConstraintsWildcardNotLast.hs:4:9: error:

-    Wildcard ‘_’ not allowed in a constraint

-      except as the last top-level constraint of a type signature

-        e.g  f :: (Eq a, _) => blah

-      in the type signature for ‘foo’

+
+ExtraConstraintsWildcardNotLast.hs:4:9: error:
+    Wildcard ‘_’ not allowed in a constraint
+      except as the last top-level constraint of a type signature
+        e.g  f :: (Eq a, _) => blah
+      in the type signature for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardTwice.stderr b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardTwice.stderr
index eb17e6d20b..5e6013da7f 100644
--- a/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardTwice.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/ExtraConstraintsWildcardTwice.stderr
@@ -1,6 +1,6 @@
-

-ExtraConstraintsWildcardTwice.hs:4:10: error:

-    Wildcard ‘_’ not allowed in a constraint

-      except as the last top-level constraint of a type signature

-        e.g  f :: (Eq a, _) => blah

-      in the type signature for ‘foo’

+
+ExtraConstraintsWildcardTwice.hs:4:10: error:
+    Wildcard ‘_’ not allowed in a constraint
+      except as the last top-level constraint of a type signature
+        e.g  f :: (Eq a, _) => blah
+      in the type signature for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/NamedWildcardInTypeSplice.stderr b/testsuite/tests/partial-sigs/should_fail/NamedWildcardInTypeSplice.stderr
index d3dbc1c2cb..ad78d8c7ef 100644
--- a/testsuite/tests/partial-sigs/should_fail/NamedWildcardInTypeSplice.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/NamedWildcardInTypeSplice.stderr
@@ -1,8 +1,8 @@
-

-NamedWildcardInTypeSplice.hs:8:16: error:

-    • Not in scope: type variable ‘_a’

-    • In the Template Haskell quotation [t| _a -> _a |]

-

-NamedWildcardInTypeSplice.hs:8:22: error:

-    • Not in scope: type variable ‘_a’

-    • In the Template Haskell quotation [t| _a -> _a |]

+
+NamedWildcardInTypeSplice.hs:8:16: error:
+    • Not in scope: type variable ‘_a’
+    • In the Template Haskell quotation [t| _a -> _a |]
+
+NamedWildcardInTypeSplice.hs:8:22: error:
+    • Not in scope: type variable ‘_a’
+    • In the Template Haskell quotation [t| _a -> _a |]
diff --git a/testsuite/tests/partial-sigs/should_fail/NestedExtraConstraintsWildcard.stderr b/testsuite/tests/partial-sigs/should_fail/NestedExtraConstraintsWildcard.stderr
index dc5ff5b091..1dbe74f0cb 100644
--- a/testsuite/tests/partial-sigs/should_fail/NestedExtraConstraintsWildcard.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/NestedExtraConstraintsWildcard.stderr
@@ -1,6 +1,6 @@
-

-NestedExtraConstraintsWildcard.hs:4:23: error:

-    Wildcard ‘_’ not allowed in a constraint

-      except as the last top-level constraint of a type signature

-        e.g  f :: (Eq a, _) => blah

-      in the type signature for ‘foo’

+
+NestedExtraConstraintsWildcard.hs:4:23: error:
+    Wildcard ‘_’ not allowed in a constraint
+      except as the last top-level constraint of a type signature
+        e.g  f :: (Eq a, _) => blah
+      in the type signature for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/NestedNamedExtraConstraintsWildcard.stderr b/testsuite/tests/partial-sigs/should_fail/NestedNamedExtraConstraintsWildcard.stderr
index afd5bdc24f..bd0cc8c3f8 100644
--- a/testsuite/tests/partial-sigs/should_fail/NestedNamedExtraConstraintsWildcard.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/NestedNamedExtraConstraintsWildcard.stderr
@@ -1,4 +1,4 @@
-

-NestedNamedExtraConstraintsWildcard.hs:4:23: error:

-    Wildcard ‘_a’ not allowed in a constraint

-      in the type signature for ‘foo’

+
+NestedNamedExtraConstraintsWildcard.hs:4:23: error:
+    Wildcard ‘_a’ not allowed in a constraint
+      in the type signature for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/PartialClassMethodSignature.stderr b/testsuite/tests/partial-sigs/should_fail/PartialClassMethodSignature.stderr
index ebaf904a6f..b470912526 100644
--- a/testsuite/tests/partial-sigs/should_fail/PartialClassMethodSignature.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/PartialClassMethodSignature.stderr
@@ -1,4 +1,4 @@
-

-PartialClassMethodSignature.hs:6:15: error:

-    Wildcard ‘_’ not allowed

-      in a class method signature for ‘foo’

+
+PartialClassMethodSignature.hs:6:15: error:
+    Wildcard ‘_’ not allowed
+      in a class method signature for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/PartialClassMethodSignature2.stderr b/testsuite/tests/partial-sigs/should_fail/PartialClassMethodSignature2.stderr
index 0f89e33e8b..354f1d5ee7 100644
--- a/testsuite/tests/partial-sigs/should_fail/PartialClassMethodSignature2.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/PartialClassMethodSignature2.stderr
@@ -1,4 +1,4 @@
-

-PartialClassMethodSignature2.hs:5:17: error:

-    Wildcard ‘_’ not allowed

-      in a class method signature for ‘foo’

+
+PartialClassMethodSignature2.hs:5:17: error:
+    Wildcard ‘_’ not allowed
+      in a class method signature for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/UnnamedConstraintWildcard1.stderr b/testsuite/tests/partial-sigs/should_fail/UnnamedConstraintWildcard1.stderr
index 1176d4e510..9efcdb8641 100644
--- a/testsuite/tests/partial-sigs/should_fail/UnnamedConstraintWildcard1.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/UnnamedConstraintWildcard1.stderr
@@ -1,6 +1,6 @@
-

-UnnamedConstraintWildcard1.hs:4:13: error:

-    Wildcard ‘_’ not allowed in a constraint

-      except as the last top-level constraint of a type signature

-        e.g  f :: (Eq a, _) => blah

-      in the type signature for ‘foo’

+
+UnnamedConstraintWildcard1.hs:4:13: error:
+    Wildcard ‘_’ not allowed in a constraint
+      except as the last top-level constraint of a type signature
+        e.g  f :: (Eq a, _) => blah
+      in the type signature for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/UnnamedConstraintWildcard2.stderr b/testsuite/tests/partial-sigs/should_fail/UnnamedConstraintWildcard2.stderr
index 3e01a2e760..c695321da7 100644
--- a/testsuite/tests/partial-sigs/should_fail/UnnamedConstraintWildcard2.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/UnnamedConstraintWildcard2.stderr
@@ -1,6 +1,6 @@
-

-UnnamedConstraintWildcard2.hs:4:8: error:

-    Wildcard ‘_’ not allowed in a constraint

-      except as the last top-level constraint of a type signature

-        e.g  f :: (Eq a, _) => blah

-      in the type signature for ‘foo’

+
+UnnamedConstraintWildcard2.hs:4:8: error:
+    Wildcard ‘_’ not allowed in a constraint
+      except as the last top-level constraint of a type signature
+        e.g  f :: (Eq a, _) => blah
+      in the type signature for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInADT1.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInADT1.stderr
index d5e7c72298..8d88278060 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInADT1.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInADT1.stderr
@@ -1,4 +1,4 @@
-

-WildcardInADT1.hs:4:26: error:

-    Wildcard ‘_’ not allowed

-      in the definition of data constructor ‘Foo’

+
+WildcardInADT1.hs:4:26: error:
+    Wildcard ‘_’ not allowed
+      in the definition of data constructor ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInADT2.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInADT2.stderr
index ec1ddf7189..2c8acc3307 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInADT2.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInADT2.stderr
@@ -1,4 +1,4 @@
-

-WildcardInADT2.hs:4:34: error:

-    Wildcard ‘_’ not allowed

-      in the definition of data constructor ‘Foo’

+
+WildcardInADT2.hs:4:34: error:
+    Wildcard ‘_’ not allowed
+      in the definition of data constructor ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInADT3.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInADT3.stderr
index 26a3f68316..48e38d84ed 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInADT3.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInADT3.stderr
@@ -1,4 +1,4 @@
-

-WildcardInADT3.hs:4:27: error:

-    Wildcard ‘_’ not allowed

-      in the definition of data constructor ‘Foo’

+
+WildcardInADT3.hs:4:27: error:
+    Wildcard ‘_’ not allowed
+      in the definition of data constructor ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInADTContext1.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInADTContext1.stderr
index 02bcdfc504..359d8ddbec 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInADTContext1.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInADTContext1.stderr
@@ -1,7 +1,7 @@
-

-WildcardInADTContext1.hs:1:37: warning:

-    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

-

-WildcardInADTContext1.hs:4:13: error:

-    Wildcard ‘_’ not allowed

-      in the data type declaration for ‘Foo’

+
+WildcardInADTContext1.hs:1:37: warning:
+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
+
+WildcardInADTContext1.hs:4:13: error:
+    Wildcard ‘_’ not allowed
+      in the data type declaration for ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInADTContext2.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInADTContext2.stderr
index efa5707692..43756593d8 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInADTContext2.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInADTContext2.stderr
@@ -1,7 +1,7 @@
-

-WildcardInADTContext2.hs:1:53: warning:

-    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

-

-WildcardInADTContext2.hs:4:10: error:

-    Not in scope: type variable ‘_a’

-    Perhaps you meant ‘a’ (line 4)

+
+WildcardInADTContext2.hs:1:53: warning:
+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
+
+WildcardInADTContext2.hs:4:10: error:
+    Not in scope: type variable ‘_a’
+    Perhaps you meant ‘a’ (line 4)
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInDefault.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInDefault.stderr
index a02f8a6144..5321815171 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInDefault.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInDefault.stderr
@@ -1,4 +1,4 @@
-

-WildcardInDefault.hs:4:10: error:

-    Wildcard ‘_’ not allowed

-      in a `default' declaration

+
+WildcardInDefault.hs:4:10: error:
+    Wildcard ‘_’ not allowed
+      in a `default' declaration
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInDefaultSignature.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInDefaultSignature.stderr
index 0b15bd05fe..941ea1c5d4 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInDefaultSignature.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInDefaultSignature.stderr
@@ -1,4 +1,4 @@
-

-WildcardInDefaultSignature.hs:7:16: error:

-    Wildcard ‘_’ not allowed

-      in a class method signature for ‘f’

+
+WildcardInDefaultSignature.hs:7:16: error:
+    Wildcard ‘_’ not allowed
+      in a class method signature for ‘f’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInDeriving.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInDeriving.stderr
index 6387f2a473..054c0a424c 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInDeriving.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInDeriving.stderr
@@ -1,4 +1,4 @@
-

-WildcardInDeriving.hs:5:22: error:

-    Wildcard ‘_’ not allowed

-      in the data type declaration for ‘Foo’

+
+WildcardInDeriving.hs:5:22: error:
+    Wildcard ‘_’ not allowed
+      in the data type declaration for ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInForeignExport.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInForeignExport.stderr
index 812599b7c6..e207df7528 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInForeignExport.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInForeignExport.stderr
@@ -1,4 +1,4 @@
-

-WildcardInForeignExport.hs:6:37: error:

-    Wildcard ‘_’ not allowed

-      in the foreign declaration for ‘foo’

+
+WildcardInForeignExport.hs:6:37: error:
+    Wildcard ‘_’ not allowed
+      in the foreign declaration for ‘foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInForeignImport.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInForeignImport.stderr
index 27f877a445..3c34f027d1 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInForeignImport.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInForeignImport.stderr
@@ -1,4 +1,4 @@
-

-WildcardInForeignImport.hs:6:48: error:

-    Wildcard ‘_’ not allowed

-      in the foreign declaration for ‘c_sin’

+
+WildcardInForeignImport.hs:6:48: error:
+    Wildcard ‘_’ not allowed
+      in the foreign declaration for ‘c_sin’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInGADT1.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInGADT1.stderr
index eb5e8414ee..c542644539 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInGADT1.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInGADT1.stderr
@@ -1,4 +1,4 @@
-

-WildcardInGADT1.hs:5:19: error:

-    Wildcard ‘_’ not allowed

-      in the definition of data constructor ‘Foo’

+
+WildcardInGADT1.hs:5:19: error:
+    Wildcard ‘_’ not allowed
+      in the definition of data constructor ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInGADT2.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInGADT2.stderr
index e338ae454f..bf63d2a997 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInGADT2.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInGADT2.stderr
@@ -1,4 +1,4 @@
-

-WildcardInGADT2.hs:5:17: error:

-    Wildcard ‘_’ not allowed

-      in the definition of data constructor ‘Foo’

+
+WildcardInGADT2.hs:5:17: error:
+    Wildcard ‘_’ not allowed
+      in the definition of data constructor ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInInstanceHead.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInInstanceHead.stderr
index 1bfeca73c3..9090475bc6 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInInstanceHead.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInInstanceHead.stderr
@@ -1,4 +1,4 @@
-

-WildcardInInstanceHead.hs:7:14: error:

-    Wildcard ‘_’ not allowed

-      in an instance declaration for ‘Foo’

+
+WildcardInInstanceHead.hs:7:14: error:
+    Wildcard ‘_’ not allowed
+      in an instance declaration for ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInInstanceSig.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInInstanceSig.stderr
index e8e5e246f7..1e59fb7122 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInInstanceSig.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInInstanceSig.stderr
@@ -1,4 +1,4 @@
-

-WildcardInInstanceSig.hs:5:13: error:

-    Wildcard ‘_’ not allowed

-      in a class method signature for ‘negate’

+
+WildcardInInstanceSig.hs:5:13: error:
+    Wildcard ‘_’ not allowed
+      in a class method signature for ‘negate’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInNewtype.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInNewtype.stderr
index b8d28fe528..72e60eebdc 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInNewtype.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInNewtype.stderr
@@ -1,4 +1,4 @@
-

-WildcardInNewtype.hs:7:29: error:

-    Wildcard ‘_’ not allowed

-      in the definition of data constructor ‘Foo’

+
+WildcardInNewtype.hs:7:29: error:
+    Wildcard ‘_’ not allowed
+      in the definition of data constructor ‘Foo’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInPatSynSig.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInPatSynSig.stderr
index dbe95a88d3..c27b0c90d1 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInPatSynSig.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInPatSynSig.stderr
@@ -1,4 +1,4 @@
-

-WildcardInPatSynSig.hs:4:37: error:

-    Wildcard ‘_’ not allowed

-      in a pattern synonym signature for ‘Single’

+
+WildcardInPatSynSig.hs:4:37: error:
+    Wildcard ‘_’ not allowed
+      in a pattern synonym signature for ‘Single’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr
index cbd06fdbcb..19df37a766 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInStandaloneDeriving.stderr
@@ -1,6 +1,6 @@
-

-WildcardInStandaloneDeriving.hs:4:19: error: Malformed instance: _

-

-WildcardInStandaloneDeriving.hs:4:19: error:

-    Wildcard ‘_’ not allowed

-      in In a deriving declaration

+
+WildcardInStandaloneDeriving.hs:4:19: error: Malformed instance: _
+
+WildcardInStandaloneDeriving.hs:4:19: error:
+    Wildcard ‘_’ not allowed
+      in In a deriving declaration
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInTypeFamilyInstanceRHS.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInTypeFamilyInstanceRHS.stderr
index ae394f8a1d..1572c86e0b 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInTypeFamilyInstanceRHS.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInTypeFamilyInstanceRHS.stderr
@@ -1,4 +1,4 @@
-

-WildcardInTypeFamilyInstanceRHS.hs:8:25: error:

-    Wildcard ‘_’ not allowed

-      in the declaration for type synonym ‘Dual’

+
+WildcardInTypeFamilyInstanceRHS.hs:8:25: error:
+    Wildcard ‘_’ not allowed
+      in the declaration for type synonym ‘Dual’
diff --git a/testsuite/tests/partial-sigs/should_fail/WildcardInTypeSynonymRHS.stderr b/testsuite/tests/partial-sigs/should_fail/WildcardInTypeSynonymRHS.stderr
index 2ef322ff69..6b921a1130 100644
--- a/testsuite/tests/partial-sigs/should_fail/WildcardInTypeSynonymRHS.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/WildcardInTypeSynonymRHS.stderr
@@ -1,4 +1,4 @@
-

-WildcardInTypeSynonymRHS.hs:4:18: error:

-    Wildcard ‘_’ not allowed

-      in the declaration for type synonym ‘Foo’

+
+WildcardInTypeSynonymRHS.hs:4:18: error:
+    Wildcard ‘_’ not allowed
+      in the declaration for type synonym ‘Foo’