4 files changed, 47 insertions, 50 deletions

diff --git a/testsuite/tests/ghci/scripts/T2182ghci.stderr b/testsuite/tests/ghci/scripts/T2182ghci.stderr
index dd65a7fc1f..8a8d3dd65b 100644
--- a/testsuite/tests/ghci/scripts/T2182ghci.stderr
+++ b/testsuite/tests/ghci/scripts/T2182ghci.stderr
@@ -1,25 +1,25 @@
 
 <interactive>:2:1: error:
-    No instance for (Show (r0 -> r0)) arising from a use of ‘print’
-      (maybe you haven't applied a function to enough arguments?)
-    In a stmt of an interactive GHCi command: print it
+    • No instance for (Show (t0 -> t0)) arising from a use of ‘print’
+        (maybe you haven't applied a function to enough arguments?)
+    • In a stmt of an interactive GHCi command: print it
 
 <interactive>:10:1: error:
-    No instance for (Show (r0 -> r0)) arising from a use of ‘print’
-      (maybe you haven't applied a function to enough arguments?)
-    In a stmt of an interactive GHCi command: print it
+    • No instance for (Show (t0 -> t0)) arising from a use of ‘print’
+        (maybe you haven't applied a function to enough arguments?)
+    • In a stmt of an interactive GHCi command: print it
 
 <interactive>:19:1: error:
-    No instance for (Show (r0 -> r0)) arising from a use of ‘print’
-      (maybe you haven't applied a function to enough arguments?)
-    In a stmt of an interactive GHCi command: print it
+    • No instance for (Show (t0 -> t0)) arising from a use of ‘print’
+        (maybe you haven't applied a function to enough arguments?)
+    • In a stmt of an interactive GHCi command: print it
 
 <interactive>:28:1: error:
-    No instance for (Show (r0 -> r0)) arising from a use of ‘print’
-      (maybe you haven't applied a function to enough arguments?)
-    In a stmt of an interactive GHCi command: print it
+    • No instance for (Show (t0 -> t0)) arising from a use of ‘print’
+        (maybe you haven't applied a function to enough arguments?)
+    • In a stmt of an interactive GHCi command: print it
 
 <interactive>:49:1: error:
-    No instance for (Show (r0 -> r0)) arising from a use of ‘print’
-      (maybe you haven't applied a function to enough arguments?)
-    In a stmt of an interactive GHCi command: print it
+    • No instance for (Show (t0 -> t0)) arising from a use of ‘print’
+        (maybe you haven't applied a function to enough arguments?)
+    • In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/ghci/scripts/T8959.script b/testsuite/tests/ghci/scripts/T8959.script
index da60aeb44e..e8f7490111 100644
--- a/testsuite/tests/ghci/scripts/T8959.script
+++ b/testsuite/tests/ghci/scripts/T8959.script
@@ -1,20 +1,22 @@
 :set -XPatternGuards -XArrows -XRankNTypes
 
+let hr :: (forall a. a -> a) -> a; hr _ = undefined
+
 :t lookup
-:t undefined :: (forall a. a -> a) -> a
+:t hr :: (forall a. a -> a) -> a
 :t () >- () -< () >>- () -<< ()
 let fun foo | True <- () = ()
 
 :set -fprint-unicode-syntax
 
 :t lookup
-:t undefined :: (forall a. a -> a) -> a
+:t hr :: (forall a. a -> a) -> a
 :t () >- () -< () >>- () -<< ()
 let fun foo | True <- () = ()
 
 :set -fno-print-unicode-syntax
 
 :t lookup
-:t undefined :: (forall a. a -> a) -> a
+:t hr :: (forall a. a -> a) -> a
 :t () >- () -< () >>- () -<< ()
 let fun foo | True <- () = ()
diff --git a/testsuite/tests/ghci/scripts/T8959.stderr b/testsuite/tests/ghci/scripts/T8959.stderr
index 2c1d5e5d25..2890a172c2 100644
--- a/testsuite/tests/ghci/scripts/T8959.stderr
+++ b/testsuite/tests/ghci/scripts/T8959.stderr
@@ -1,36 +1,36 @@
 
-<interactive>:1:1:
+<interactive>:1:1: error:
     Arrow command found where an expression was expected:
       () >- () -< () >>- () -<< ()
 
-<interactive>:6:15:
-    Couldn't match expected type ‘()’ with actual type ‘Bool’
-    In the pattern: True
-    In a stmt of a pattern guard for
-                   an equation for ‘fun’:
-      True <- ()
-    In an equation for ‘fun’: fun foo | True <- () = ()
+<interactive>:8:15: error:
+    • Couldn't match expected type ‘()’ with actual type ‘Bool’
+    • In the pattern: True
+      In a stmt of a pattern guard for
+                     an equation for ‘fun’:
+        True <- ()
+      In an equation for ‘fun’: fun foo | True <- () = ()
 
-<interactive>:1:1:
+<interactive>:1:1: error:
     Arrow command found where an expression was expected:
       () ⤚ () ⤙ () ⤜ () ⤛ ()
 
-<interactive>:13:15:
-    Couldn't match expected type ‘()’ with actual type ‘Bool’
-    In the pattern: True
-    In a stmt of a pattern guard for
-                   an equation for ‘fun’:
-      True ← ()
-    In an equation for ‘fun’: fun foo | True ← () = ()
+<interactive>:15:15: error:
+    • Couldn't match expected type ‘()’ with actual type ‘Bool’
+    • In the pattern: True
+      In a stmt of a pattern guard for
+                     an equation for ‘fun’:
+        True ← ()
+      In an equation for ‘fun’: fun foo | True ← () = ()
 
-<interactive>:1:1:
+<interactive>:1:1: error:
     Arrow command found where an expression was expected:
       () >- () -< () >>- () -<< ()
 
-<interactive>:20:15:
-    Couldn't match expected type ‘()’ with actual type ‘Bool’
-    In the pattern: True
-    In a stmt of a pattern guard for
-                   an equation for ‘fun’:
-      True <- ()
-    In an equation for ‘fun’: fun foo | True <- () = ()
+<interactive>:22:15: error:
+    • Couldn't match expected type ‘()’ with actual type ‘Bool’
+    • In the pattern: True
+      In a stmt of a pattern guard for
+                     an equation for ‘fun’:
+        True <- ()
+      In an equation for ‘fun’: fun foo | True <- () = ()
diff --git a/testsuite/tests/ghci/scripts/T8959.stdout b/testsuite/tests/ghci/scripts/T8959.stdout
index 02b5f828c2..6e40a5f316 100644
--- a/testsuite/tests/ghci/scripts/T8959.stdout
+++ b/testsuite/tests/ghci/scripts/T8959.stdout
@@ -1,11 +1,6 @@
 lookup :: Eq a => a -> [(a, b)] -> Maybe b
-undefined :: (forall a. a -> a) -> a
-  :: (?callStack::GHC.Stack.Types.CallStack) =>
-     (forall a1. a1 -> a1) -> a
+hr :: (forall a. a -> a) -> a :: (forall a1. a1 -> a1) -> a
 lookup ∷ Eq a ⇒ a → [(a, b)] → Maybe b
-undefined :: (forall a. a -> a) -> a
-  ∷ (?callStack::GHC.Stack.Types.CallStack) ⇒ (∀ a1. a1 → a1) → a
+hr :: (forall a. a -> a) -> a ∷ (∀ a1. a1 → a1) → a
 lookup :: Eq a => a -> [(a, b)] -> Maybe b
-undefined :: (forall a. a -> a) -> a
-  :: (?callStack::GHC.Stack.Types.CallStack) =>
-     (forall a1. a1 -> a1) -> a
+hr :: (forall a. a -> a) -> a :: (forall a1. a1 -> a1) -> a