Update test output

Author: goldfirere

ocaml/testsuite/tests/typing-layouts-float64/basics.ml

@@ -257,9 +257,17 @@ and 'a t5_11 = {x : 'a t5_10; y : 'a}
 type ('a : float64) t5_12 = {x : 'a; y : float#};;
 [%%expect{|
 type ('a : float64, 'b : float64) t5_9 = { x : 'a; y : 'b; z : 'a; }
-type ('a : float64) t5_10 = 'a t_float64_id
-and ('a : float64) t5_11 = { x : 'a t5_10; y : 'a; }
-type ('a : float64) t5_12 = { x : 'a; y : float#; }
+Line 4, characters 20-28:
+4 | and 'a t5_11 = {x : 'a t5_10; y : 'a}
+                        ^^^^^^^^
+Error: Layout mismatch in final type declaration consistency check.
+       This is most often caused by the fact that type inference is not
+       clever enough to propagate layouts through variables in different
+       declarations. It is also not clever enough to produce a good error
+       message, so we'll say this instead:
+         'a has layout float64, which does not overlap with value.
+       The fix will likely be to add a layout annotation on a parameter to
+       the declaration where this error is reported.
 |}];;
 
 type ('a : float64) t5_13 = {x : 'a; y : float#};;

ocaml/testsuite/tests/typing-layouts-float64/unboxed_floats_disabled.compilers.reference

@@ -1,4 +1,4 @@
-File "unboxed_floats.ml", line 321, characters 25-31:
-321 | let ( let* ) x (f : _ -> float#) = f x
+File "unboxed_floats.ml", line 326, characters 25-31:
+326 | let ( let* ) x (f : _ -> float#) = f x
                                ^^^^^^
-Error: This construct requires the beta version of the extension "layouts", which is disabled and cannot be used
+Error: This construct requires the stable version of the extension "layouts", which is disabled and cannot be used

ocaml/testsuite/tests/typing-layouts/annots.ml

@@ -329,7 +329,14 @@ type ('a : immediate) t_imm
 Line 3, characters 15-39:
 3 | type s = { f : ('a : value). 'a -> 'a u }
                    ^^^^^^^^^^^^^^^^^^^^^^^^
-Error: Type 'a has layout value, which is not a sublayout of immediate.
+Error: Layout mismatch in final type declaration consistency check.
+       This is most often caused by the fact that type inference is not
+       clever enough to propagate layouts through variables in different
+       declarations. It is also not clever enough to produce a good error
+       message, so we'll say this instead:
+         'a has layout value, which is not a sublayout of immediate.
+       The fix will likely be to add a layout annotation on a parameter to
+       the declaration where this error is reported.
 |}]
 (* CR layouts v1.5: the location on that message is wrong. But it's hard
    to improve, because it comes from re-checking typedtree, where we don't

ocaml/testsuite/tests/typing-layouts/basics.ml

@@ -1388,7 +1388,14 @@ type ('a : immediate) t2_imm
 Line 3, characters 15-40:
 3 | type s = { f : ('a : value) . 'a -> 'a u }
                    ^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: Type 'a has layout value, which is not a sublayout of immediate.
+Error: Layout mismatch in final type declaration consistency check.
+       This is most often caused by the fact that type inference is not
+       clever enough to propagate layouts through variables in different
+       declarations. It is also not clever enough to produce a good error
+       message, so we'll say this instead:
+         'a has layout value, which is not a sublayout of immediate.
+       The fix will likely be to add a layout annotation on a parameter to
+       the declaration where this error is reported.
 |}]
 
 (****************************************************)

ocaml/testsuite/tests/typing-layouts/datatypes.ml

@@ -317,8 +317,17 @@ and t2 = Mk1 of t_float64 t | Mk2
 type 'a t8_5 = { x : 'a t8_6; y : string}
 and 'a t8_6 = 'a float64_t;;
 [%%expect {|
-type ('a : float64) t8_5 = { x : 'a t8_6; y : string; }
-and ('a : float64) t8_6 = 'a float64_t
+Line 1, characters 21-28:
+1 | type 'a t8_5 = { x : 'a t8_6; y : string}
+                         ^^^^^^^
+Error: Layout mismatch in final type declaration consistency check.
+       This is most often caused by the fact that type inference is not
+       clever enough to propagate layouts through variables in different
+       declarations. It is also not clever enough to produce a good error
+       message, so we'll say this instead:
+         'a has layout float64, which does not overlap with value.
+       The fix will likely be to add a layout annotation on a parameter to
+       the declaration where this error is reported.
 |}]