Update safe haskell tests for change output formatting

28 files changed, 56 insertions, 30 deletions

diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
index 9ca2bbe817..9bf0315382 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
@@ -1,3 +1,4 @@
 
 ImpSafe01.hs:9:1:
-    base:Data.Word can't be safely imported! The package (base) the module resides in isn't trusted.
+    Data.Word: Can't be safely imported!
+    The package (base) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
index bc6eecffee..1afb523f9a 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
@@ -1,3 +1,4 @@
 
 ImpSafeOnly03.hs:4:1:
-    safePkg01-1.0:M_SafePkg3 can't be safely imported! The package (safePkg01-1.0) the module resides in isn't trusted.
+    M_SafePkg3: Can't be safely imported!
+    The package (safePkg01-1.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
index 99147eea77..9aab02d5d8 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags17.stderr
@@ -1,3 +1,4 @@
 
 SafeFlags17.hs:4:8:
-    base:Prelude can't be safely imported! The package (base) the module resides in isn't trusted.
+    Prelude: Can't be safely imported!
+    The package (base) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags22.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags22.stderr
index 7913f6847d..c4650485db 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags22.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags22.stderr
@@ -2,4 +2,6 @@
 SafeFlags22.hs:1:16:
     Warning: `SafeFlags22' has been infered as unsafe!
     Reason:
-        base:System.IO.Unsafe can't be safely imported! The module itself isn't safe.
+        SafeFlags22.hs:7:1:
+            System.IO.Unsafe: Can't be safely imported!
+            The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags23.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags23.stderr
index bf8b7d937e..3ebe04944d 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags23.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags23.stderr
@@ -2,7 +2,9 @@
 SafeFlags23.hs:1:16:
     Warning: `SafeFlags22' has been infered as unsafe!
     Reason:
-        base:System.IO.Unsafe can't be safely imported! The module itself isn't safe.
+        SafeFlags23.hs:7:1:
+            System.IO.Unsafe: Can't be safely imported!
+            The module itself isn't safe.
 
 <no location info>: 
 Failing due to -Werror.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
index 15212f3dc9..f96f1719ae 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
@@ -2,4 +2,5 @@
 [2 of 2] Compiling UnsafeInfered01  ( UnsafeInfered01.hs, UnsafeInfered01.o )
 
 UnsafeInfered01.hs:4:1:
-    main:UnsafeInfered01_A can't be safely imported! The module itself isn't safe.
+    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 587b8a9a9e..7bd9a17733 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
@@ -2,4 +2,5 @@
 [2 of 2] Compiling UnsafeInfered02  ( UnsafeInfered02.hs, UnsafeInfered02.o )
 
 UnsafeInfered02.hs:4:1:
-    main:UnsafeInfered02_A can't be safely imported! The module itself isn't safe.
+    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 f869206b03..ea21c40d48 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
@@ -2,4 +2,5 @@
 [2 of 2] Compiling UnsafeInfered03  ( UnsafeInfered03.hs, UnsafeInfered03.o )
 
 UnsafeInfered03.hs:4:1:
-    main:UnsafeInfered03_A can't be safely imported! The module itself isn't safe.
+    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 e08d2ae2fc..2b23ce076f 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
@@ -2,4 +2,5 @@
 [2 of 2] Compiling UnsafeInfered05  ( UnsafeInfered05.hs, UnsafeInfered05.o )
 
 UnsafeInfered05.hs:4:1:
-    main:UnsafeInfered05_A can't be safely imported! The module itself isn't safe.
+    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 55f91664e3..73c182535c 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
@@ -2,4 +2,5 @@
 [2 of 2] Compiling UnsafeInfered06  ( UnsafeInfered06.hs, UnsafeInfered06.o )
 
 UnsafeInfered06.hs:4:1:
-    main:UnsafeInfered06_A can't be safely imported! The module itself isn't safe.
+    UnsafeInfered06_A: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered07.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered07.stderr
index 86c4717dd7..98a7e808f0 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered07.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered07.stderr
@@ -2,4 +2,5 @@
 [2 of 2] Compiling UnsafeInfered07  ( UnsafeInfered07.hs, UnsafeInfered07.o )
 
 UnsafeInfered07.hs:4:1:
-    main:UnsafeInfered07_A can't be safely imported! The module itself isn't safe.
+    UnsafeInfered07_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 b204c68c0e..8ff259633a 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr
@@ -2,4 +2,5 @@
 [2 of 2] Compiling UnsafeInfered08  ( UnsafeInfered08.hs, UnsafeInfered08.o )
 
 UnsafeInfered08.hs:4:1:
-    main:UnsafeInfered08_A can't be safely imported! The module itself isn't safe.
+    UnsafeInfered08_A: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
index bb5c92682b..42082c854e 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
@@ -3,4 +3,5 @@
 [3 of 3] Compiling UnsafeInfered09  ( UnsafeInfered09.hs, UnsafeInfered09.o )
 
 UnsafeInfered09.hs:4:1:
-    main:UnsafeInfered09_A can't be safely imported! The module itself isn't safe.
+    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 25bca5dd08..c67b891952 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
@@ -2,4 +2,5 @@
 [2 of 2] Compiling UnsafeInfered10  ( UnsafeInfered10.hs, UnsafeInfered10.o )
 
 UnsafeInfered10.hs:5:1:
-    main:UnsafeInfered10_A can't be safely imported! The module itself isn't safe.
+    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 fc809c3372..89c9cf1759 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
@@ -3,9 +3,11 @@
 UnsafeInfered11_A.hs:1:16:
     Warning: `UnsafeInfered11_A' has been infered as unsafe!
     Reason:
-        Rule "lookupx/T" ignored
-        User defined rules are disabled under Safe Haskell
+        UnsafeInfered11_A.hs:17:11:
+            Rule "lookupx/T" ignored
+            User defined rules are disabled under Safe Haskell
 [2 of 2] Compiling UnsafeInfered11  ( UnsafeInfered11.hs, UnsafeInfered11.o )
 
 UnsafeInfered11.hs:5:1:
-    main:UnsafeInfered11_A can't be safely imported! The module itself isn't safe.
+    UnsafeInfered11_A: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr
index bc676ca6f1..7c5128d7e2 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr
@@ -1,3 +1,4 @@
 
 BadImport01.hs:5:1:
-    base:System.IO.Unsafe can't be safely imported! The module itself isn't safe.
+    System.IO.Unsafe: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport04.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport04.stderr
index f653cd697e..2c2f3befb2 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport04.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport04.stderr
@@ -1,3 +1,3 @@
 
 BadImport04.hs:5:1:
-    base:Foreign can't be safely imported! The module itself isn't safe.
+    Foreign: Can't be safely imported! The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport05.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport05.stderr
index 7d8be6a70f..32a42f59d9 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport05.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport05.stderr
@@ -1,3 +1,4 @@
 
 BadImport05.hs:5:1:
-    base:System.IO.Unsafe can't be safely imported! The module itself isn't safe.
+    System.IO.Unsafe: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport06.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport06.stderr
index 6fbf954599..51a5bebec3 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport06.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport06.stderr
@@ -1,3 +1,4 @@
 
 BadImport06.hs:5:1:
-    base:Debug.Trace can't be safely imported! The module itself isn't safe.
+    Debug.Trace: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport07.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport07.stderr
index ccd6b34563..5133f045ec 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport07.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport07.stderr
@@ -1,3 +1,4 @@
 
 BadImport07.hs:5:1:
-    base:Unsafe.Coerce can't be safely imported! The module itself isn't safe.
+    Unsafe.Coerce: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport08.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport08.stderr
index a62d1543a0..d3f193cff7 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport08.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport08.stderr
@@ -1,3 +1,4 @@
 
 BadImport08.hs:5:1:
-    base:Control.Monad.ST can't be safely imported! The module itself isn't safe.
+    Control.Monad.ST: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport09.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport09.stderr
index 3db67ac12f..2dd8e7cf58 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport09.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport09.stderr
@@ -1,3 +1,4 @@
 
 BadImport09.hs:5:1:
-    base:Foreign.Marshal can't be safely imported! The module itself isn't safe.
+    Foreign.Marshal: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr
index 6176ffb0a5..a35d679f8d 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr
@@ -1,3 +1,3 @@
 
 Dep05.hs:5:1:
-    base:GHC.Arr can't be safely imported! The module itself isn't safe.
+    GHC.Arr: Can't be safely imported! The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr
index 7e0b4d0d55..ae8bdf8fd6 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr
@@ -1,3 +1,3 @@
 
 Dep06.hs:4:1:
-    base:GHC.Conc can't be safely imported! The module itself isn't safe.
+    GHC.Conc: Can't be safely imported! The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr
index 5faecb951b..dcc7c4849d 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr
@@ -1,3 +1,4 @@
 
 Dep07.hs:4:1:
-    base:GHC.ForeignPtr can't be safely imported! The module itself isn't safe.
+    GHC.ForeignPtr: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr
index 9e06797427..386f6412c3 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr
@@ -1,3 +1,4 @@
 
 Dep08.hs:5:1:
-    base:GHC.IOArray can't be safely imported! The module itself isn't safe.
+    GHC.IOArray: Can't be safely imported!
+    The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr
index e0de172782..76606c2e40 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr
@@ -1,3 +1,3 @@
 
 Dep09.hs:4:1:
-    base:GHC.Ptr can't be safely imported! The module itself isn't safe.
+    GHC.Ptr: Can't be safely imported! The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr
index 4ef525183e..68fe214bc8 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr
@@ -1,3 +1,3 @@
 
 Dep10.hs:4:1:
-    base:GHC.ST can't be safely imported! The module itself isn't safe.
+    GHC.ST: Can't be safely imported! The module itself isn't safe.