[commit: ghc] master: Fix tests broken by c9a88db3ac4f1c3e97e3492ebe076f2df6463540 (0c9777b)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0c9777b787d072f9f57e0cdfe44e2e2d48217077/ghc

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

commit 0c9777b787d072f9f57e0cdfe44e2e2d48217077
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Feb 13 17:49:02 2018 -0500

    Fix tests broken by c9a88db3ac4f1c3e97e3492ebe076f2df6463540


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

0c9777b787d072f9f57e0cdfe44e2e2d48217077
 testsuite/tests/ghci/scripts/T5545.stdout              | 5 ++++-
 testsuite/tests/typecheck/should_compile/holes.stderr  | 6 +++---
 testsuite/tests/typecheck/should_compile/holes3.stderr | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/testsuite/tests/ghci/scripts/T5545.stdout b/testsuite/tests/ghci/scripts/T5545.stdout
index 2262c35..9780ffc 100644
--- a/testsuite/tests/ghci/scripts/T5545.stdout
+++ b/testsuite/tests/ghci/scripts/T5545.stdout
@@ -1,2 +1,5 @@
-($!) :: (a -> b) -> a -> b 	-- Defined in ‘GHC.Base’
+($!) ::
+  forall (r :: GHC.Types.RuntimeRep) a (b :: TYPE r).
+  (a -> b) -> a -> b
+  	-- Defined in ‘GHC.Base’
 infixr 0 $!
diff --git a/testsuite/tests/typecheck/should_compile/holes.stderr b/testsuite/tests/typecheck/should_compile/holes.stderr
index 8421e9a..a4b32cd 100644
--- a/testsuite/tests/typecheck/should_compile/holes.stderr
+++ b/testsuite/tests/typecheck/should_compile/holes.stderr
@@ -371,9 +371,6 @@ holes.hs:11:15: warning: [-Wtyped-holes (in -Wdefault)]
         (.) :: forall b c a. (b -> c) -> (a -> b) -> a -> c
           (imported from ‘Prelude’ at holes.hs:1:8-12
            (and originally defined in ‘GHC.Base’))
-        ($!) :: forall a b. (a -> b) -> a -> b
-          (imported from ‘Prelude’ at holes.hs:1:8-12
-           (and originally defined in ‘GHC.Base’))
         uncurry :: forall a b c. (a -> b -> c) -> (a, b) -> c
           (imported from ‘Prelude’ at holes.hs:1:8-12
            (and originally defined in ‘Data.Tuple’))
@@ -463,6 +460,9 @@ holes.hs:11:15: warning: [-Wtyped-holes (in -Wdefault)]
         ($) :: forall a (b :: TYPE r). (a -> b) -> a -> b
           (imported from ‘Prelude’ at holes.hs:1:8-12
            (and originally defined in ‘GHC.Base’))
+        ($!) :: forall a (b :: TYPE r). (a -> b) -> a -> b
+          (imported from ‘Prelude’ at holes.hs:1:8-12
+           (and originally defined in ‘GHC.Base’))
         id :: forall a. a -> a
           (imported from ‘Prelude’ at holes.hs:1:8-12
            (and originally defined in ‘GHC.Base’))
diff --git a/testsuite/tests/typecheck/should_compile/holes3.stderr b/testsuite/tests/typecheck/should_compile/holes3.stderr
index ce1c947..add03e2 100644
--- a/testsuite/tests/typecheck/should_compile/holes3.stderr
+++ b/testsuite/tests/typecheck/should_compile/holes3.stderr
@@ -374,9 +374,6 @@ holes3.hs:11:15: error:
         (.) :: forall b c a. (b -> c) -> (a -> b) -> a -> c
           (imported from ‘Prelude’ at holes3.hs:1:8-13
            (and originally defined in ‘GHC.Base’))
-        ($!) :: forall a b. (a -> b) -> a -> b
-          (imported from ‘Prelude’ at holes3.hs:1:8-13
-           (and originally defined in ‘GHC.Base’))
         uncurry :: forall a b c. (a -> b -> c) -> (a, b) -> c
           (imported from ‘Prelude’ at holes3.hs:1:8-13
            (and originally defined in ‘Data.Tuple’))
@@ -466,6 +463,9 @@ holes3.hs:11:15: error:
         ($) :: forall a (b :: TYPE r). (a -> b) -> a -> b
           (imported from ‘Prelude’ at holes3.hs:1:8-13
            (and originally defined in ‘GHC.Base’))
+        ($!) :: forall a (b :: TYPE r). (a -> b) -> a -> b
+          (imported from ‘Prelude’ at holes3.hs:1:8-13
+           (and originally defined in ‘GHC.Base’))
         id :: forall a. a -> a
           (imported from ‘Prelude’ at holes3.hs:1:8-13
            (and originally defined in ‘GHC.Base’))