[commit: ghc] ghc-7.10: testsuite: fix some failures from merge problems (07282c7)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/07282c7222d718e6d3df8d8f843d95d534dd7062/ghc

>---------------------------------------------------------------

commit 07282c7222d718e6d3df8d8f843d95d534dd7062
Author: Austin Seipp <austin at well-typed.com>
Date:   Tue Jun 2 14:07:35 2015 -0500

    testsuite: fix some failures from merge problems
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

07282c7222d718e6d3df8d8f843d95d534dd7062
 testsuite/tests/driver/T2507.stderr                   |  4 ++--
 testsuite/tests/ghci/prog013/prog013.stderr           | 12 ++++++------
 testsuite/tests/simplCore/should_compile/T4945.stdout |  8 +++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/testsuite/tests/driver/T2507.stderr b/testsuite/tests/driver/T2507.stderr
index 925a870..e4365a3 100644
--- a/testsuite/tests/driver/T2507.stderr
+++ b/testsuite/tests/driver/T2507.stderr
@@ -1,5 +1,5 @@
 
 T2507.hs:5:7:
-    Couldn't match expected type `Int' with actual type `()'
+    Couldn't match expected type ‘Int’ with actual type ‘()’
     In the expression: ()
-    In an equation for `foo': foo = ()
+    In an equation for ‘foo’: foo = ()
diff --git a/testsuite/tests/ghci/prog013/prog013.stderr b/testsuite/tests/ghci/prog013/prog013.stderr
index ce8827f..f701de4 100644
--- a/testsuite/tests/ghci/prog013/prog013.stderr
+++ b/testsuite/tests/ghci/prog013/prog013.stderr
@@ -1,17 +1,17 @@
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
 
-<interactive>:10:1: error: parse error on input ‘+’
+<interactive>:10:1: parse error on input ‘+’
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
 
-Bad.hs:3:8: error:
+Bad.hs:3:8:
     lexical error in string/character literal at character '\n'
diff --git a/testsuite/tests/simplCore/should_compile/T4945.stdout b/testsuite/tests/simplCore/should_compile/T4945.stdout
index 4e53cfd..2467d21 100644
--- a/testsuite/tests/simplCore/should_compile/T4945.stdout
+++ b/testsuite/tests/simplCore/should_compile/T4945.stdout
@@ -1,9 +1,7 @@
-                               -> STUArray RealWorld Int Int -> (# State# RealWorld, () #)
+                               -> STUArray RealWorld Int Int
                               (ipv3 [OS=OneShot] :: STUArray RealWorld Int Int) ->
                                           case ipv3 of _ [Occ=Dead] { STUArray ds5 ds6 dt ds7 ->
                                   (Data.Array.Base.STUArray
-                                          (Data.Array.Base.STUArray
-                                          (Data.Array.Base.STUArray
                                   (Data.Array.Base.STUArray
-                                          (Data.Array.Base.STUArray
-                                          (Data.Array.Base.STUArray
+                                  (Data.Array.Base.STUArray
+                                  (Data.Array.Base.STUArray