Upgrade to OCamlformat 0.26.0

.ocamlformat

@@ -1,4 +1,4 @@
-version = 0.24.1
+version = 0.26.0
 profile = conventional
 
 ocaml-version = 4.08.0

src/irmin-chunk/irmin_chunk.ml

@@ -192,8 +192,8 @@ struct
     in
     let chunking = Conf.get config Conf.Key.chunking in
     (if max_children <= 1 then
-     let min = Chunk.size_of_index_header + (H.hash_size * 2) in
-     err_too_small ~min chunk_size);
+       let min = Chunk.size_of_index_header + (H.hash_size * 2) in
+       err_too_small ~min chunk_size);
     [%log.debug
       "config: chunk-size=%d digest-size=%d max-data=%d max-children=%d"
         chunk_size H.hash_size max_data max_children];

src/irmin-graphql/unix/irmin_graphql_unix.ml

@@ -25,7 +25,8 @@ module Server = struct
   end
 
   module Make_ext
-      (S : Irmin.Generic_key.S) (Remote : sig
+      (S : Irmin.Generic_key.S)
+      (Remote : sig
         val remote : remote_fn option
       end)
       (T : Irmin_graphql.Server.CUSTOM_TYPES
@@ -55,7 +56,8 @@ module Server = struct
       (T)
 
   module Make
-      (S : Irmin.Generic_key.S) (Remote : sig
+      (S : Irmin.Generic_key.S)
+      (Remote : sig
         val remote : remote_fn option
       end) =
     Irmin_graphql.Server.Make

src/irmin-graphql/unix/irmin_graphql_unix.mli

@@ -25,7 +25,8 @@ module Server : sig
   end
 
   module Make
-      (S : Irmin.Generic_key.S) (Remote : sig
+      (S : Irmin.Generic_key.S)
+      (Remote : sig
         val remote : remote_fn option
       end) :
     Irmin_graphql.Server.S
@@ -34,7 +35,8 @@ module Server : sig
        and module IO = Cohttp_lwt_unix.IO
 
   module Make_ext
-      (S : Irmin.Generic_key.S) (Remote : sig
+      (S : Irmin.Generic_key.S)
+      (Remote : sig
         val remote : remote_fn option
       end)
       (T : Irmin_graphql.Server.CUSTOM_TYPES

src/irmin-http/irmin_http_server.ml

@@ -62,13 +62,14 @@ module Make (HTTP : Cohttp_lwt.S.Server) (S : Irmin.S) = struct
     let err = Fmt.str "Parse error %S: %s" str e in
     Wm.respond ~body:(`String err) 400 rd
 
-  module Content_addressable (S : sig
-    include Irmin.Content_addressable.S
+  module Content_addressable
+      (S : sig
+        include Irmin.Content_addressable.S
 
-    val batch : B.Repo.t -> (read_write t -> 'a Lwt.t) -> 'a Lwt.t
-  end)
-  (K : Irmin.Type.S with type t = S.key)
-  (V : Irmin.Type.S with type t = S.value) =
+        val batch : B.Repo.t -> (read_write t -> 'a Lwt.t) -> 'a Lwt.t
+      end)
+      (K : Irmin.Type.S with type t = S.key)
+      (V : Irmin.Type.S with type t = S.value) =
   struct
     let with_key rd f =
       match Irmin.Type.of_string K.t (Wm.Rd.lookup_path_info_exn "id" rd) with

src/irmin-pack/inode.ml

@@ -21,7 +21,8 @@ exception Max_depth of int
 
 module Make_internal
     (Conf : Conf.S)
-    (H : Irmin.Hash.S) (Key : sig
+    (H : Irmin.Hash.S)
+    (Key : sig
       include Irmin.Key.S with type hash = H.t
 
       val unfindable_of_hash : hash -> t

src/irmin-pack/inode_intf.ml

@@ -256,7 +256,8 @@ module type Sigs = sig
 
   module Make_internal
       (Conf : Conf.S)
-      (H : Irmin.Hash.S) (Key : sig
+      (H : Irmin.Hash.S)
+      (Key : sig
         include Irmin.Key.S with type hash = H.t
 
         val unfindable_of_hash : hash -> t

src/irmin-pack/unix/gc.mli

@@ -17,7 +17,8 @@
 open! Import
 
 (** [Make] returns a module that can manage GC processes. *)
-module Make (Args : Gc_args.S) : sig
+module Make
+    (Args : Gc_args.S) : sig
   module Args : Gc_args.S
 
   type t

src/irmin-pack/unix/gc_worker.mli

@@ -19,7 +19,8 @@
 open! Import
 module Payload = Control_file.Payload.Upper.Latest
 
-module Make (Args : Gc_args.S) : sig
+module Make
+    (Args : Gc_args.S) : sig
   module Args : Gc_args.S
 
   val run_and_output_result :

src/irmin-pack/unix/lower.ml

@@ -385,19 +385,19 @@ module Make (Io : Io.S) (Errs : Io_errors.S with module Io = Io) = struct
   let archive_seq_exn ~upper_root ~generation ~to_archive t =
     Errs.raise_if_error
       (let open Result_syntax in
-      let* () = if t.readonly then Error `Ro_not_allowed else Ok () in
-      let* v =
-        match appendable_volume t with
-        | None -> Error `Lower_has_no_volume
-        | Some v -> Ok v
-      in
-      let* () =
-        match t.open_volume with
-        | None -> Ok ()
-        | Some v0 -> if Volume.eq v0 v then close_open_volume t else Ok ()
-      in
-      let is_first = volume_num t = 1 in
-      Volume.archive_seq ~upper_root ~generation ~to_archive ~is_first v)
+       let* () = if t.readonly then Error `Ro_not_allowed else Ok () in
+       let* v =
+         match appendable_volume t with
+         | None -> Error `Lower_has_no_volume
+         | Some v -> Ok v
+       in
+       let* () =
+         match t.open_volume with
+         | None -> Ok ()
+         | Some v0 -> if Volume.eq v0 v then close_open_volume t else Ok ()
+       in
+       let is_first = volume_num t = 1 in
+       Volume.archive_seq ~upper_root ~generation ~to_archive ~is_first v)
 
   let read_exn ~off ~len ?volume t b =
     let _, volume = read_range_exn ~off ~min_len:len ~max_len:len ?volume t b in

src/irmin-pack/unix/pack_store.ml

@@ -232,9 +232,9 @@ struct
            become valid on [reload]; otherwise we know that this key wasn't
            constructed for this store. *)
         (if not (Control.readonly (Fm.control t.fm)) then
-         let io_offset = Dispatcher.end_offset t.dispatcher in
-         invalid_read "invalid key %a checked for membership (IO offset = %a)"
-           pp_key k Int63.pp io_offset);
+           let io_offset = Dispatcher.end_offset t.dispatcher in
+           invalid_read "invalid key %a checked for membership (IO offset = %a)"
+             pp_key k Int63.pp io_offset);
         false
     | Errors.Pack_error (`Invalid_sparse_read _) -> false
     | Errors.Pack_error (`Invalid_prefix_read _) -> false

src/irmin-test/irmin_bench.mli

@@ -15,7 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-module Make (S : Irmin.Generic_key.KV with type Schema.Contents.t = string) : sig
+module Make
+    (S : Irmin.Generic_key.KV with type Schema.Contents.t = string) : sig
   val run :
     config:(root:string -> Irmin.config) -> size:(root:string -> int) -> unit
 end

src/irmin/commit_intf.ml

@@ -259,7 +259,9 @@ module type Sigs = sig
     module Info : Info.S with type t = Info.Default.t
     (** Serialisation format for V1 info. *)
 
-    module Make (Hash : Hash.S) (C : Generic_key.S with module Info := Info) : sig
+    module Make
+        (Hash : Hash.S)
+        (C : Generic_key.S with module Info := Info) : sig
       include
         Generic_key.S
           with module Info = Info

src/irmin/dot.ml

@@ -90,8 +90,8 @@ module Make (S : Store.Generic_key.S) = struct
     let label_of_node k _ =
       let s =
         (if html then
-         sprintf "<div class='node'><div class='sha1'>%s</div></div>"
-        else fun x -> x)
+           sprintf "<div class='node'><div class='sha1'>%s</div></div>"
+         else fun x -> x)
           (string_of_hash Node.Hash.t k)
       in
       `Label s

src/irmin/irmin.mli

@@ -54,9 +54,9 @@ end
 module Type = Repr
 (** Dynamic types for Irmin values, supplied by
     {{:https://github.com/mirage/repr} [Repr]}. These values can be derived from
-    type definitions via [\[@@deriving irmin\]] (see the
+    type definitions via [[@@deriving irmin]] (see the
     {{:https://github.com/mirage/irmin/blob/main/README_PPX.md} documentation
-    for [ppx_irmin]})*)
+      for [ppx_irmin]})*)
 
 module Hash = Hash
 (** Hashing functions.

src/irmin/node.ml

@@ -78,7 +78,8 @@ module Irmin_hash = Hash
 (* A [Make] implementation providing the subset of [S] that can be implemented
    over abstract [key] types. *)
 module Make_core
-    (Hash : Hash.S) (Path : sig
+    (Hash : Hash.S)
+    (Path : sig
       type step [@@deriving irmin]
     end)
     (Metadata : Metadata.S)
@@ -335,7 +336,8 @@ module Portable = struct
 end
 
 module Make_generic_key
-    (Hash : Hash.S) (Path : sig
+    (Hash : Hash.S)
+    (Path : sig
       type step [@@deriving irmin]
     end)
     (Metadata : Metadata.S)
@@ -403,7 +405,8 @@ struct
 end
 
 module Make_generic_key_v2
-    (Hash : Hash.S) (Path : sig
+    (Hash : Hash.S)
+    (Path : sig
       type step [@@deriving irmin]
     end)
     (Metadata : Metadata.S)
@@ -422,7 +425,8 @@ struct
 end
 
 module Make
-    (Hash : Hash.S) (Path : sig
+    (Hash : Hash.S)
+    (Path : sig
       type step [@@deriving irmin]
     end)
     (Metadata : Metadata.S) =

src/irmin/node_intf.ml

@@ -351,7 +351,8 @@ module type Sigs = sig
       and metadata implementations. The contents and node values are addressed
       directly by their hash. *)
   module Make
-      (Hash : Hash.S) (Path : sig
+      (Hash : Hash.S)
+      (Path : sig
         type step [@@deriving irmin]
       end)
       (Metadata : Metadata.S) :

src/irmin/proof.ml

@@ -19,7 +19,8 @@ include Proof_intf
 
 module Make
     (C : Type.S)
-    (H : Type.S) (S : sig
+    (H : Type.S)
+    (S : sig
       type step [@@deriving irmin]
     end)
     (M : Type.S) =

src/irmin/proof_intf.ml

@@ -71,10 +71,10 @@ module type S = sig
       concrete proof or a hash of that proof.
 
       If an inode proof contains singleton children [i_0, ..., i_n] such as:
-      [{length=l; proofs = \[ (i_0, {proofs = ... { proofs = \[ (i_n, p) \] }})\]}],
+      [{length=l; proofs = [ (i_0, {proofs = ... { proofs = [ (i_n, p) ] }})]}],
       then it is compressed into the inode extender
-      [{length=l; segment = \[i_0;..;i_n\]; proof=p}] sharing the same length
-      [l] and final proof [p]. *)
+      [{length=l; segment = [i_0;..;i_n]; proof=p}] sharing the same length [l]
+      and final proof [p]. *)
 
   (** The type for compressed and partial Merkle tree proofs.
 
@@ -329,7 +329,8 @@ module type Proof = sig
 
   module Make
       (C : Type.S)
-      (H : Hash.S) (P : sig
+      (H : Hash.S)
+      (P : sig
         type step [@@deriving irmin]
       end)
       (M : Type.S) : sig

src/irmin/store_intf.ml

@@ -1130,7 +1130,7 @@ module type S_generic_key = sig
   (** {Deprecated} *)
 
   val master : repo -> t Lwt.t
-    [@@ocaml.deprecated "Use `main` instead."]
+  [@@ocaml.deprecated "Use `main` instead."]
   (** @deprecated Use {!main} instead *)
 end
 

src/irmin/tree.ml

@@ -921,7 +921,7 @@ module Make (P : Backend.S) = struct
       let rec aux acc = function
         | [] ->
             (if cache then
-             match acc with Node n -> t.info.value <- Some n | Pnode _ -> ());
+               match acc with Node n -> t.info.value <- Some n | Pnode _ -> ());
             k acc
         | (k, Add e) :: rest ->
             hash_preimage_value_of_elt ~cache e (fun e ->
@@ -2420,7 +2420,7 @@ module Make (P : Backend.S) = struct
       | [] ->
           k
             (if StepMap.is_empty map then Empty
-            else Non_empty (Node.of_map ~env:(Env.empty ()) map))
+             else Non_empty (Node.of_map ~env:(Env.empty ()) map))
       | (s, n) :: t ->
           (concrete [@tailcall]) n (fun v ->
               (tree [@tailcall])

src/irmin/tree_intf.ml

@@ -307,8 +307,9 @@ module type S = sig
         [post path steps].
       - If [n] is any kind, call [tree path t'] where [t'] is the tree of [n].
 
-      See {{:https://github.com/mirage/irmin/blob/main/examples/fold.ml}
-      examples/fold.ml} for a demo of the different {!folder}s.
+      See
+      {{:https://github.com/mirage/irmin/blob/main/examples/fold.ml}
+        examples/fold.ml} for a demo of the different {!folder}s.
 
       See {!force} for details about the [force] parameters. By default it is
       [`True].

src/libirmin/commit.ml

@@ -49,8 +49,8 @@ module Make (I : Cstubs_inverted.INTERNAL) = struct
       (repo @-> hash @-> returning commit)
       (fun (type repo) repo hash ->
         with_repo' repo commit
-          (fun (module Store : Irmin.Generic_key.S with type repo = repo) repo
-          ->
+          (fun
+            (module Store : Irmin.Generic_key.S with type repo = repo) repo ->
             let hash = Root.get_hash (module Store) hash in
             let c = run (Store.Commit.of_hash repo hash) in
             match c with
@@ -62,8 +62,8 @@ module Make (I : Cstubs_inverted.INTERNAL) = struct
       (repo @-> commit_key @-> returning commit)
       (fun (type repo) repo hash ->
         with_repo' repo commit
-          (fun (module Store : Irmin.Generic_key.S with type repo = repo) repo
-          ->
+          (fun
+            (module Store : Irmin.Generic_key.S with type repo = repo) repo ->
             let hash = Root.get_commit_key (module Store) hash in
             let c = run (Store.Commit.of_key repo hash) in
             match c with
@@ -75,8 +75,8 @@ module Make (I : Cstubs_inverted.INTERNAL) = struct
       (repo @-> ptr commit @-> uint64_t @-> tree @-> info @-> returning commit)
       (fun (type repo) repo parents n tree info ->
         with_repo' repo commit
-          (fun (module Store : Irmin.Generic_key.S with type repo = repo) repo
-          ->
+          (fun
+            (module Store : Irmin.Generic_key.S with type repo = repo) repo ->
             let n = UInt64.to_int n in
             let parents =
               if is_null parents || n = 0 then []
@@ -97,8 +97,8 @@ module Make (I : Cstubs_inverted.INTERNAL) = struct
       (repo @-> commit @-> returning commit_array)
       (fun (type repo) repo commit ->
         with_repo' repo commit_array
-          (fun (module Store : Irmin.Generic_key.S with type repo = repo) repo
-          ->
+          (fun
+            (module Store : Irmin.Generic_key.S with type repo = repo) repo ->
             let commit = Root.get_commit (module Store) commit in
             let parents = Store.Commit.parents commit in
             let parents =
@@ -117,8 +117,8 @@ module Make (I : Cstubs_inverted.INTERNAL) = struct
       (repo @-> commit @-> commit @-> returning bool)
       (fun (type repo) repo a b ->
         with_repo repo false
-          (fun (module Store : Irmin.Generic_key.S with type repo = repo) repo
-          ->
+          (fun
+            (module Store : Irmin.Generic_key.S with type repo = repo) repo ->
             let a = Root.get_commit (module Store) a in
             let b = Root.get_commit (module Store) b in
             Irmin.Type.(unstage (equal (Store.commit_t repo))) a b))