Accept output changes (related to patch for #5417)

4 files changed, 29 insertions, 24 deletions

diff --git a/testsuite/tests/ghci/scripts/ghci023.stdout b/testsuite/tests/ghci/scripts/ghci023.stdout
index 855695af06..5f19876614 100644
--- a/testsuite/tests/ghci/scripts/ghci023.stdout
+++ b/testsuite/tests/ghci/scripts/ghci023.stdout
@@ -2,15 +2,15 @@
 -- via stdin
 (1,2,3)
 data Maybe a = Nothing | Just a
-catMaybes :: [Maybe a] -> [a]
-fromJust :: Maybe a -> a
-fromMaybe :: a -> Maybe a -> a
-isJust :: Maybe a -> Bool
-isNothing :: Maybe a -> Bool
-listToMaybe :: [a] -> Maybe a
-mapMaybe :: (a -> Maybe b) -> [a] -> [b]
+Data.Maybe.catMaybes :: [Maybe a] -> [a]
+Data.Maybe.fromJust :: Maybe a -> a
+Data.Maybe.fromMaybe :: a -> Maybe a -> a
+Data.Maybe.isJust :: Maybe a -> Bool
+Data.Maybe.isNothing :: Maybe a -> Bool
+Data.Maybe.listToMaybe :: [a] -> Maybe a
+Data.Maybe.mapMaybe :: (a -> Maybe b) -> [a] -> [b]
 maybe :: b -> (a -> b) -> Maybe a -> b
-maybeToList :: Maybe a -> [a]
+Data.Maybe.maybeToList :: Maybe a -> [a]
 -- via readFile
 (True,False)
 id :: a -> a
diff --git a/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr b/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
index ddc289f161..4c8c718d70 100644
--- a/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
+++ b/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
@@ -61,19 +61,24 @@ newtype N5 a b = N5 {n5 :: a b <document comment>}
 newtype N6 a b = <document comment> N6 {n6 :: a b}

 <document comment>

 newtype N7 a b = <document comment> N7 {n7 :: a b}

-class D a => C a where { a :: IO a; b :: [a]; c :: a; }

+class D a => C a where

+  { a :: IO a

+    b :: [a]

+    c :: a }

 <document comment>

-class D a where { d :: T a b; e :: (a, a); }

+class D a where

+  { d :: T a b

+    e :: (a, a) }

 <document comment>

 instance D Int where

-    { d = undefined

-      e = undefined }

+  { d = undefined

+    e = undefined }

 instance Test.D Float where

-    { d = undefined

-      e = undefined }

-class E a where { ee :: a; }

+  { d = undefined

+    e = undefined }

+class E a where { ee :: a }

 <document comment>

-class F a where { ff :: a; }

+class F a where { ff :: a }

 <document comment>

 data R

     = <document comment>

diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail8.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail8.stderr
index 88c71b690c..421bd53b25 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail8.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail8.stderr
@@ -1,4 +1,6 @@
-
-SimpleFail8.hs:9:8: Not in scope: type constructor or class `Map'
-
-SimpleFail8.hs:10:8: Not in scope: type constructor or class `S3'
+

+SimpleFail8.hs:9:8:

+    `Map' is not a (visible) associated type of class `C6'

+

+SimpleFail8.hs:10:8:

+    `S3' is not a (visible) associated type of class `C6'

diff --git a/testsuite/tests/typecheck/should_fail/tcfail051.stderr b/testsuite/tests/typecheck/should_fail/tcfail051.stderr
index 97d4b13a1e..35a33d2aa2 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail051.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail051.stderr
@@ -1,4 +1,2 @@
-
-tcfail051.hs:3:10: Not in scope: type constructor or class `B'
-
-tcfail051.hs:4:2: `op1' is not a (visible) method of class `B'
+

+tcfail051.hs:3:10: Not in scope: type constructor or class `B'