Wibbles to output.

tests/ghci/scripts/T4175.hs

@@ -17,8 +17,6 @@ instance C Int where
 instance C () where
     type D () () = Bool
 
-type family E a
-
-type instance where
+type family E a where
     E ()  = Bool
     E Int = String

tests/ghci/scripts/T4175.stdout

@@ -1,52 +1,46 @@
-type family A a b :: * 	-- Defined at T4175.hs:4:13
-type instance A (Maybe a) a -- Defined at T4175.hs:6:15
-type instance A Int Int -- Defined at T4175.hs:5:15
-data family B a 	-- Defined at T4175.hs:8:13
-data instance B () -- Defined at T4175.hs:9:15
-class C a where
-  type family D a b :: *
-  	-- Defined at T4175.hs:12:10
-type D () () -- Defined at T4175.hs:18:10
-type D Int () -- Defined at T4175.hs:15:10
-type family E a :: * 	-- Defined at T4175.hs:20:13
-type instance where
-  E () -- Defined at T4175.hs:23:5
-  E Int -- Defined at T4175.hs:24:5
-data () = () 	-- Defined in ‛GHC.Tuple’
-instance C () -- Defined at T4175.hs:17:10
-instance Bounded () -- Defined in ‛GHC.Enum’
-instance Enum () -- Defined in ‛GHC.Enum’
-instance Eq () -- Defined in ‛GHC.Classes’
-instance Ord () -- Defined in ‛GHC.Classes’
-instance Read () -- Defined in ‛GHC.Read’
-instance Show () -- Defined in ‛GHC.Show’
-type instance where
-  E () -- Defined at T4175.hs:23:5
-  E Int -- Defined at T4175.hs:24:5
-type D () () -- Defined at T4175.hs:18:10
-type D Int () -- Defined at T4175.hs:15:10
-data instance B () -- Defined at T4175.hs:9:15
-data Maybe a = Nothing | Just a 	-- Defined in ‛Data.Maybe’
-instance Eq a => Eq (Maybe a) -- Defined in ‛Data.Maybe’
-instance Monad Maybe -- Defined in ‛Data.Maybe’
-instance Functor Maybe -- Defined in ‛Data.Maybe’
-instance Ord a => Ord (Maybe a) -- Defined in ‛Data.Maybe’
-instance Read a => Read (Maybe a) -- Defined in ‛GHC.Read’
-instance Show a => Show (Maybe a) -- Defined in ‛GHC.Show’
-type instance A (Maybe a) a -- Defined at T4175.hs:6:15
-data Int = GHC.Types.I# GHC.Prim.Int# 	-- Defined in ‛GHC.Types’
-instance C Int -- Defined at T4175.hs:14:10
-instance Bounded Int -- Defined in ‛GHC.Enum’
-instance Enum Int -- Defined in ‛GHC.Enum’
-instance Eq Int -- Defined in ‛GHC.Classes’
-instance Integral Int -- Defined in ‛GHC.Real’
-instance Num Int -- Defined in ‛GHC.Num’
-instance Ord Int -- Defined in ‛GHC.Classes’
-instance Read Int -- Defined in ‛GHC.Read’
-instance Real Int -- Defined in ‛GHC.Real’
-instance Show Int -- Defined in ‛GHC.Show’
-type instance where
-  E () -- Defined at T4175.hs:23:5
-  E Int -- Defined at T4175.hs:24:5
-type D Int () -- Defined at T4175.hs:15:10
-type instance A Int Int -- Defined at T4175.hs:5:15
+type family A a b :: * 	-- Defined at T4175.hs:4:13
+type instance A (Maybe a) a -- Defined at T4175.hs:6:1
+type instance A Int Int -- Defined at T4175.hs:5:1
+data family B a 	-- Defined at T4175.hs:8:13
+data instance B () -- Defined at T4175.hs:9:15
+class C a where
+  type family D a b :: *
+  	-- Defined at T4175.hs:12:10
+type D () () -- Defined at T4175.hs:18:5
+type D Int () -- Defined at T4175.hs:15:5
+type family E a :: * where
+    E () = Bool
+    E Int = String
+  	-- Defined at T4175.hs:20:13
+data () = () 	-- Defined in ‛GHC.Tuple’
+instance C () -- Defined at T4175.hs:17:10
+instance Bounded () -- Defined in ‛GHC.Enum’
+instance Enum () -- Defined in ‛GHC.Enum’
+instance Eq () -- Defined in ‛GHC.Classes’
+instance Ord () -- Defined in ‛GHC.Classes’
+instance Read () -- Defined in ‛GHC.Read’
+instance Show () -- Defined in ‛GHC.Show’
+type D () () -- Defined at T4175.hs:18:5
+type D Int () -- Defined at T4175.hs:15:5
+data instance B () -- Defined at T4175.hs:9:15
+data Maybe a = Nothing | Just a 	-- Defined in ‛Data.Maybe’
+instance Eq a => Eq (Maybe a) -- Defined in ‛Data.Maybe’
+instance Monad Maybe -- Defined in ‛Data.Maybe’
+instance Functor Maybe -- Defined in ‛Data.Maybe’
+instance Ord a => Ord (Maybe a) -- Defined in ‛Data.Maybe’
+instance Read a => Read (Maybe a) -- Defined in ‛GHC.Read’
+instance Show a => Show (Maybe a) -- Defined in ‛GHC.Show’
+type instance A (Maybe a) a -- Defined at T4175.hs:6:1
+data Int = GHC.Types.I# GHC.Prim.Int# 	-- Defined in ‛GHC.Types’
+instance C Int -- Defined at T4175.hs:14:10
+instance Bounded Int -- Defined in ‛GHC.Enum’
+instance Enum Int -- Defined in ‛GHC.Enum’
+instance Eq Int -- Defined in ‛GHC.Classes’
+instance Integral Int -- Defined in ‛GHC.Real’
+instance Num Int -- Defined in ‛GHC.Num’
+instance Ord Int -- Defined in ‛GHC.Classes’
+instance Read Int -- Defined in ‛GHC.Read’
+instance Real Int -- Defined in ‛GHC.Real’
+instance Show Int -- Defined in ‛GHC.Show’
+type D Int () -- Defined at T4175.hs:15:5
+type instance A Int Int -- Defined at T4175.hs:5:1

tests/th/T5886a.hs

@@ -11,4 +11,4 @@ class C α where
 
 bang ∷ DecsQ
 bang = return [InstanceD [] (AppT (ConT ''C) (ConT ''Int))
-                [TySynInstD ''AT [TySynEqn [ConT ''Int] (ConT ''Int)]]]
+                [TySynInstD ''AT (TySynEqn [ConT ''Int] (ConT ''Int))]]

tests/th/TH_TyInstWhere1.stderr

@@ -1,9 +1,9 @@
 TH_TyInstWhere1.hs:1:1: Splicing declarations
-    [d| type instance where
+    [d| type family F (a :: k) (b :: k) :: Bool where
           F a a = True
           F a b = False |]
   ======>
-    TH_TyInstWhere1.hs:(7,3)-(9,24)
-    type instance where
+    TH_TyInstWhere1.hs:(5,3)-(7,24)
+    type family F (a :: k) (b :: k) :: Bool where
       F a a = True
       F a b = False

tests/th/TH_TyInstWhere2.stderr

@@ -1,5 +1,5 @@
 
-TH_TyInstWhere2.hs:9:4: Warning:
-    type instance where
-    TH_TyInstWhere2.F a_0 a_0 = 'GHC.Types.True
-    TH_TyInstWhere2.F a_1 b_2 = 'GHC.Types.False
+TH_TyInstWhere2.hs:7:4: Warning:
+    type family F_0 (a_1 :: k_2) (b_3 :: k_2) :: GHC.Types.Bool where
+    F_0 a_4 a_4 = 'GHC.Types.True
+    F_0 a_5 b_6 = 'GHC.Types.False

tests/typecheck/should_compile/T5481.stderr

@@ -1,8 +1,8 @@
 
-T5481.hs:6:10:
+T5481.hs:6:5:
     The RHS of an associated type declaration mentions type variable ‛b’
       All such variables must be bound on the LHS
 
-T5481.hs:8:10:
+T5481.hs:8:5:
     The RHS of an associated type declaration mentions type variable ‛a’
       All such variables must be bound on the LHS

tests/typecheck/should_fail/AssocTyDef05.stderr

@@ -1,5 +1,5 @@
 
 AssocTyDef05.hs:6:10:
     Number of parameters must match family declaration; expected 1
-    In the type instance declaration for ‛Typ’
+    In the type synonym instance default declaration for ‛Typ’
     In the class declaration for ‛Cls’

tests/typecheck/should_fail/AssocTyDef06.stderr

@@ -1,5 +1,5 @@
 
 AssocTyDef06.hs:6:10:
-    Number of parameters must match family declaration; expected 1
+    Number of parameters must match family declaration; expected no more than 1
     In the type instance declaration for ‛Typ’
     In the class declaration for ‛Cls’