Accept error message changes

testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.stderr

@@ -4,10 +4,7 @@ drvfail011.hs:8:1:
       arising from a use of `=='
     In the expression: ((a1 == b1))
     In an equation for `==': == (T1 a1) (T1 b1) = ((a1 == b1))
-    When typechecking a standalone-derived method for `Eq (T a)':
-      == (T1 a1) (T1 b1) = ((a1 == b1))
-      == a b
-           = case (ShouldFail.$con2tag_T a) of {
-               a# -> case (ShouldFail.$con2tag_T b) of {
-                       b# -> (a# GHC.Prim.==# b#) } }
+    When typechecking the code for  `=='
+      in a standalone derived instance for `Eq (T a)':
+      To see the code I am typechecking, use -ddump-deriv
     In the instance declaration for `Eq (T a)'

testsuite/tests/ghc-regress/indexed-types/should_compile/T3017.stderr

@@ -12,7 +12,7 @@ TYPE CONSTRUCTORS
 INSTANCES
   instance Coll (ListColl a) -- Defined at T3017.hs:12:11-27
 FAMILY INSTANCES
-  type instance Elem (ListColl a) -- Defined at T3017.hs:13:9-12
+  type Elem (ListColl a) -- Defined at T3017.hs:13:9-12
 Tycons with generics:
 Dependent modules: []
 Dependent packages: [base, ghc-prim, integer-gmp]

testsuite/tests/ghc-regress/indexed-types/should_fail/T4246.stderr

 
 T4246.hs:8:9:
     Conflicting family instance declarations:
-      type instance F a -- Defined at T4246.hs:8:9
-      type instance F Int -- Defined at T4246.hs:11:9
+      type F a -- Defined at T4246.hs:8:9
+      type F Int -- Defined at T4246.hs:11:9
 
 T4246.hs:14:15:
     Conflicting family instance declarations:

testsuite/tests/ghc-regress/simplCore/should_compile/spec-inline.stderr

@@ -166,7 +166,7 @@ Roman.foo :: GHC.Types.Int -> GHC.Types.Int
  Arity=1,
  Caf=NoCafRefs,
  Str=DmdType S(A)m,
- Unf=Unf{Src=InlineRule, TopLvl=True, Arity=1, Value=True,
+ Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
          ConLike=True, Cheap=True, Expandable=True,
          Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
          Tmpl= \ (n [Occ=Once!] :: GHC.Types.Int) ->