ocamlformat

.github/workflows/main.yml

@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         ocaml-compiler:
-            - '5.1'
+            - '5.2'
     runs-on: 'ubuntu-latest'
     steps:
       - uses: actions/checkout@main
@@ -79,6 +79,6 @@ jobs:
           dune-cache: true
           allow-prerelease-opam: true
 
-      - run: opam install ocamlformat.0.24.1
+      - run: opam install ocamlformat.0.26.2
       - run: opam exec -- make format-check
 

.ocamlformat

@@ -1,4 +1,4 @@
-version = 0.24.1
+version = 0.26.2
 profile=conventional
 margin=80
 if-then-else=k-r

src/data/CCKTree.ml

@@ -66,8 +66,7 @@ let rec cut_depth n t () =
 (** {2 Graph Traversals} *)
 
 (** Abstract Set structure *)
-class type ['a] pset =
+class type ['a] pset = object
-  object
   method add : 'a -> 'a pset
   method mem : 'a -> bool
 end

src/data/CCKTree.mli

@@ -49,8 +49,7 @@ val cut_depth : int -> 'a t -> 'a t
 (** {2 Graph Traversals} *)
 
 (** Abstract Set structure *)
-class type ['a] pset =
+class type ['a] pset = object
-  object
   method add : 'a -> 'a pset
   method mem : 'a -> bool
 end

src/monomorphic/CCMonomorphic.mli

@@ -40,6 +40,5 @@ val ( == ) : [ `Consider_using_CCEqual_physical ]
 [@@ocaml.deprecated "Please use CCEqual.physical or Stdlib.(==) instead."]
 
 val ( != ) : [ `Consider_using_CCEqual_physical ]
-  [@@ocaml.deprecated
+[@@ocaml.deprecated "Please use [not CCEqual.physical] or Stdlib.(!=) instead."]
-    "Please use [not CCEqual.physical] or Stdlib.(!=) instead."]
 (** @since 2.1 *)

tests/core/t_sexp.ml

@@ -183,7 +183,8 @@ let arb_csexp_arb =
   let genstr = Q.Gen.(string_size ~gen:genchar (0 -- 15)) in
   Q.make ~print:Sexp0.to_string ~shrink:shrink_csexp (gen_csexp genstr)
 
-module Make (X : sig
+module Make
+    (X : sig
       val arb : Csexp.t Q.arbitrary
     end)
     () =

tests/data/t_persistenthashtbl.ml

@@ -108,8 +108,7 @@ let t1 = H.of_list [ 1, "a"; 2, "b1" ] in
 let t2 = H.of_list [ 2, "b2"; 3, "c" ] in
 let t =
   H.merge
-    ~f:
+    ~f:(fun _ -> function
-      (fun _ -> function
       | `Right v2 -> Some v2
       | `Left v1 -> Some v1
       | `Both (s1, s2) ->