Fix tests after #7848

6 files changed, 29 insertions, 29 deletions

diff --git a/testsuite/tests/generics/GenDerivOutput.stderr b/testsuite/tests/generics/GenDerivOutput.stderr
index 041208f9e4..b47b3f3e42 100644
--- a/testsuite/tests/generics/GenDerivOutput.stderr
+++ b/testsuite/tests/generics/GenDerivOutput.stderr
@@ -16,8 +16,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = GenDerivOutput.Nil
     GHC.Generics.to
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
-                                                                           (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+                                                                             (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
       = GenDerivOutput.Cons g1 g2
   
   instance GHC.Generics.Generic1 GenDerivOutput.List where
@@ -35,8 +35,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = GenDerivOutput.Nil
     GHC.Generics.to1
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
-                                                                           (GHC.Generics.M1 g2)))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+                                                                             (GHC.Generics.M1 g2)))))
       = GenDerivOutput.Cons
           (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
   
@@ -60,8 +60,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = GenDerivOutput.Empty
     GHC.Generics.to
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
-                                                                           (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+                                                                             (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
       = GenDerivOutput.Rose g1 g2
   
   instance GHC.Generics.Generic1 GenDerivOutput.Rose where
@@ -81,8 +81,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = GenDerivOutput.Empty
     GHC.Generics.to1
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
-                                                                           (GHC.Generics.M1 g2)))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+                                                                             (GHC.Generics.M1 g2)))))
       = GenDerivOutput.Rose
           (GHC.Generics.unPar1 g1)
           ((GHC.Base..)
diff --git a/testsuite/tests/generics/GenDerivOutput1_0.stderr b/testsuite/tests/generics/GenDerivOutput1_0.stderr
index e782b6e186..222d2d3165 100644
--- a/testsuite/tests/generics/GenDerivOutput1_0.stderr
+++ b/testsuite/tests/generics/GenDerivOutput1_0.stderr
@@ -16,8 +16,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = GenDerivOutput1_0.Nil
     GHC.Generics.to1
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
-                                                                           (GHC.Generics.M1 g2)))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+                                                                             (GHC.Generics.M1 g2)))))
       = GenDerivOutput1_0.Cons
           (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
   
diff --git a/testsuite/tests/generics/GenDerivOutput1_1.stderr b/testsuite/tests/generics/GenDerivOutput1_1.stderr
index ff6d2578a2..6b9f546990 100644
--- a/testsuite/tests/generics/GenDerivOutput1_1.stderr
+++ b/testsuite/tests/generics/GenDerivOutput1_1.stderr
@@ -16,8 +16,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = CanDoRep1_1.D0d
     GHC.Generics.to1
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
-                                                                           (GHC.Generics.M1 g2)))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+                                                                             (GHC.Generics.M1 g2)))))
       = CanDoRep1_1.D1d (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
   
   instance GHC.Generics.Generic (CanDoRep1_1.Dd a) where
@@ -35,8 +35,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = CanDoRep1_1.D0d
     GHC.Generics.to
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
-                                                                           (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+                                                                             (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
       = CanDoRep1_1.D1d g1 g2
   
   instance GHC.Generics.Generic (CanDoRep1_1.Dc a) where
@@ -54,8 +54,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = CanDoRep1_1.D0c
     GHC.Generics.to
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
-                                                                           (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+                                                                             (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
       = CanDoRep1_1.D1c g1 g2
   
   instance GHC.Generics.Generic1 CanDoRep1_1.Db where
@@ -73,8 +73,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = CanDoRep1_1.D0b
     GHC.Generics.to1
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
-                                                                           (GHC.Generics.M1 g2)))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+                                                                             (GHC.Generics.M1 g2)))))
       = CanDoRep1_1.D1b (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
   
   instance GHC.Generics.Generic (CanDoRep1_1.Da a) where
@@ -92,8 +92,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = CanDoRep1_1.D0
     GHC.Generics.to
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
-                                                                           (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+                                                                             (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
       = CanDoRep1_1.D1 g1 g2
   
   instance GHC.Generics.Generic1 CanDoRep1_1.Da where
@@ -111,8 +111,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = CanDoRep1_1.D0
     GHC.Generics.to1
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
-                                                                           (GHC.Generics.M1 g2)))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+                                                                             (GHC.Generics.M1 g2)))))
       = CanDoRep1_1.D1 (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
   
   instance GHC.Generics.Generic (CanDoRep1_1.Db a) where
@@ -130,8 +130,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = CanDoRep1_1.D0b
     GHC.Generics.to
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
-                                                                           (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+                                                                             (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
       = CanDoRep1_1.D1b g1 g2
   
   instance GHC.Generics.Generic1 CanDoRep1_1.Dc where
@@ -149,8 +149,8 @@ Derived instances:
       (GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
       = CanDoRep1_1.D0c
     GHC.Generics.to1
-      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
-                                                                           (GHC.Generics.M1 g2)))))
+      (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+                                                                             (GHC.Generics.M1 g2)))))
       = CanDoRep1_1.D1c (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
   
   instance GHC.Generics.Datatype CanDoRep1_1.D1Da where
diff --git a/testsuite/tests/typecheck/should_fail/T2688.stderr b/testsuite/tests/typecheck/should_fail/T2688.stderr
index bbc415ad81..e4fef7d182 100644
--- a/testsuite/tests/typecheck/should_fail/T2688.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2688.stderr
@@ -9,7 +9,7 @@ T2688.hs:8:22:
       ‛v’ is a rigid type variable bound by
           the class declaration for ‛VectorSpace’ at T2688.hs:5:19
     Relevant bindings include
-      ^/ :: v -> s -> v (bound at T2688.hs:8:5)
+      (^/) :: v -> s -> v (bound at T2688.hs:8:5)
       v :: v (bound at T2688.hs:8:5)
       s :: s (bound at T2688.hs:8:10)
     In the second argument of ‛(/)’, namely ‛s’
diff --git a/testsuite/tests/typecheck/should_fail/T7734.stderr b/testsuite/tests/typecheck/should_fail/T7734.stderr
index d90d136a1a..539de1eaea 100644
--- a/testsuite/tests/typecheck/should_fail/T7734.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7734.stderr
@@ -11,7 +11,7 @@ T7734.hs:4:13:
 T7734.hs:5:13:
     Occurs check: cannot construct the infinite type: t2 ~ t2 -> t1
     Relevant bindings include
-      & :: (t2 -> t1) -> t -> t1 (bound at T7734.hs:5:1)
+      (&) :: (t2 -> t1) -> t -> t1 (bound at T7734.hs:5:1)
       x :: t2 -> t1 (bound at T7734.hs:5:5)
     In the first argument of ‛x’, namely ‛x’
     In the expression: x x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail021.stderr b/testsuite/tests/typecheck/should_fail/tcfail021.stderr
index 5a4e8055bc..5afea21e8c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail021.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail021.stderr
@@ -1,4 +1,4 @@
 
 tcfail021.hs:8:5:
     Pattern bindings (except simple variables) not allowed in instance declarations
-	(==, /=) = (\ x -> \ y -> True, \ x -> \ y -> False)
+      ((==), (/=)) = (\ x -> \ y -> True, \ x -> \ y -> False)