ocaml: prepare for ocaml 5.4 (#6791)

There was an incompatible change, and more errors are reported now.

Author: last-genius

.git-blame-ignore-revs

@@ -33,6 +33,7 @@ b12cf444edea15da6274975e1b2ca6a7fce2a090
 364c27f5d18ab9dd31825e67a93efabecad06823
 d8b4de9076531dd13bdffa20cc10c72290a52356
 bdf06bca7534fbc0c4fc3cee3408a51a22615226
+eefc649e17086fbc200e4da114ea673825e79864
 
 # ocp-indent
 d018d26d6acd4707a23288b327b49e44f732725e

ocaml/libs/xapi-stdext/lib/xapi-fdcaps/operations.mli

@@ -47,20 +47,18 @@ val setup : unit -> unit
 
 (** {1 Static property tests} *)
 
-val as_readable : (([< readable] as 'a), 'b) make -> ([> readable], 'b) make
+val as_readable : ([< readable], 'b) make -> ([> readable], 'b) make
 (** [as_readable_opt t] returns [Some t] when [t] is readable, and [None] otherwise. *)
 
 val as_writable : ([< writable], 'b) make -> ([> writable], 'b) make
 (** [as_writable_opt t] returns [Some t] when [t] is readable, and [None] otherwise. *)
 
 (** {1 Runtime property tests}  *)
 
-val as_readable_opt :
-  (([< rw] as 'a), 'b) make -> ([> readable], 'b) make option
+val as_readable_opt : ([< rw], 'b) make -> ([> readable], 'b) make option
 (** [as_readable_opt t] returns [Some t] when [t] is readable, and [None] otherwise. *)
 
-val as_writable_opt :
-  (([< rw] as 'a), 'b) make -> ([> writable], 'b) make option
+val as_writable_opt : ([< rw], 'b) make -> ([> writable], 'b) make option
 (** [as_writable_opt t] returns [Some t] when [t] is readable, and [None] otherwise. *)
 
 val as_spipe_opt : ('a, [< kind]) make -> ('a, [> espipe]) make option

ocaml/sdk-gen/c/helper.ml

@@ -28,19 +28,16 @@ let comment doc ?(indent = 0) s =
   let buf = Buffer.create 16 in
   let formatter = Format.formatter_of_buffer buf in
   let open Format in
-  let out, flush, newline, spaces =
-    let funcs = Format.pp_get_formatter_out_functions formatter () in
-    (funcs.out_string, funcs.out_flush, funcs.out_newline, funcs.out_spaces)
-  in
-
+  let funcs = Format.pp_get_formatter_out_functions formatter () in
+  let original_out_newline = funcs.out_newline in
   let funcs =
     {
-      out_string= out
-    ; out_flush= flush
-    ; out_newline=
-        (fun () -> out (Printf.sprintf "\n%s * " indent_str) 0 (indent + 4))
-    ; out_spaces= spaces
-    ; out_indent= spaces
+      funcs with
+      out_newline=
+        (fun () ->
+          funcs.out_string (Printf.sprintf "\n%s * " indent_str) 0 (indent + 4)
+        )
+    ; out_indent= funcs.out_spaces
     }
   in
   Format.pp_set_formatter_out_functions formatter funcs ;
@@ -61,7 +58,7 @@ let comment doc ?(indent = 0) s =
   Format.fprintf formatter "%!" ;
 
   Format.pp_set_formatter_out_functions formatter
-    {funcs with out_newline= newline} ;
+    {funcs with out_newline= original_out_newline} ;
 
   let result = Buffer.contents buf in
   let n = String.length result in