Upgrade ocamlformat to 0.28.1

Author: polytypic

.ocamlformat

@@ -1,4 +1,4 @@
 profile = default
-version = 0.27.0
+version = 0.28.1
 
 exp-grouping=preserve

bench/bench_hashtbl.ml

@@ -30,39 +30,38 @@ let run_one ~budgetf ~n_domains ?(n_ops = 100 * Util.iter_factor)
   let n_ops_todo = Countdown.create ~n_domains () in
 
   let before () =
-    begin
-      match lock_type with
-      | `Lock ->
-          Lock.holding lock @@ fun () ->
-          Hashtbl.clear t;
-          if prepopulate then begin
-            for _ = 1 to n_keys do
-              let value = Random.bits () in
-              let key = value mod n_keys in
-              Hashtbl.replace t key value
-            done
-          end
-      | `Rwlock ->
-          Rwlock.holding rwlock @@ fun () ->
-          Hashtbl.clear t;
-          if prepopulate then begin
-            for _ = 1 to n_keys do
-              let value = Random.bits () in
-              let key = value mod n_keys in
-              Hashtbl.replace t key value
-            done
-          end
-      | `Sem ->
-          Sem.acquire sem;
-          Hashtbl.clear t;
-          if prepopulate then begin
-            for _ = 1 to n_keys do
-              let value = Random.bits () in
-              let key = value mod n_keys in
-              Hashtbl.replace t key value
-            done
-          end;
-          Sem.release sem
+    begin match lock_type with
+    | `Lock ->
+        Lock.holding lock @@ fun () ->
+        Hashtbl.clear t;
+        if prepopulate then begin
+          for _ = 1 to n_keys do
+            let value = Random.bits () in
+            let key = value mod n_keys in
+            Hashtbl.replace t key value
+          done
+        end
+    | `Rwlock ->
+        Rwlock.holding rwlock @@ fun () ->
+        Hashtbl.clear t;
+        if prepopulate then begin
+          for _ = 1 to n_keys do
+            let value = Random.bits () in
+            let key = value mod n_keys in
+            Hashtbl.replace t key value
+          done
+        end
+    | `Sem ->
+        Sem.acquire sem;
+        Hashtbl.clear t;
+        if prepopulate then begin
+          for _ = 1 to n_keys do
+            let value = Random.bits () in
+            let key = value mod n_keys in
+            Hashtbl.replace t key value
+          done
+        end;
+        Sem.release sem
     end;
     Countdown.non_atomic_set n_ops_todo n_ops
   in

bench/bench_ref.ml

@@ -9,9 +9,9 @@ module Ref = struct
   let[@inline] compare_and_set x before after =
     !x == before
     && begin
-         x := after;
-         true
-       end
+      x := after;
+      true
+    end
 
   let[@inline] exchange x after =
     let before = !x in

bench/bench_stdio.ml

@@ -11,10 +11,9 @@ let run_one ~budgetf ~block_or_nonblock ~n_domains () =
   in
   let wrap _ _ = Scheduler.run in
   let work _ (inn, out, block, byte) =
-    begin
-      match block_or_nonblock with
-      | `Block -> ()
-      | `Nonblock -> Unix.set_nonblock inn
+    begin match block_or_nonblock with
+    | `Block -> ()
+    | `Nonblock -> Unix.set_nonblock inn
     end;
     for _ = 1 to n_blocks do
       let n = Unix.write out block 0 block_size in

lib/picos.domain/picos_domain.ocaml4.ml

@@ -11,9 +11,9 @@ module DLS = struct
   let[@poll error] [@inline never] compare_and_set key before after =
     !key == before
     && begin
-         key := after;
-         true
-       end
+      key := after;
+      true
+    end
 
   let rec get key =
     match !key with

lib/picos/picos.ocaml5.ml

@@ -139,14 +139,13 @@ module Computation = struct
       let rec rollback tx = function
         | Nil -> true
         | Completion r -> begin
-            begin
-              match Atomic.get r.computation with
-              | ( S (Canceled { tx = previous_tx; _ })
-                | S (Returned { tx = previous_tx; _ }) ) as before ->
-                  if tx == previous_tx then
-                    Atomic.compare_and_set r.computation before (S r.before)
-                    |> ignore
-              | S (Continue _) -> ()
+            begin match Atomic.get r.computation with
+            | ( S (Canceled { tx = previous_tx; _ })
+              | S (Returned { tx = previous_tx; _ }) ) as before ->
+                if tx == previous_tx then
+                  Atomic.compare_and_set r.computation before (S r.before)
+                  |> ignore
+            | S (Continue _) -> ()
             end;
             rollback tx r.completions
           end
@@ -188,11 +187,10 @@ module Computation = struct
     let rec commit = function
       | Nil -> true
       | Completion r ->
-          begin
-            match Atomic.get r.computation with
-            | S (Canceled r) -> r.tx <- Stopped
-            | S (Returned r) -> r.tx <- Stopped
-            | S (Continue _) -> impossible ()
+          begin match Atomic.get r.computation with
+          | S (Canceled r) -> r.tx <- Stopped
+          | S (Returned r) -> r.tx <- Stopped
+          | S (Continue _) -> impossible ()
           end;
           signal r.before;
           commit r.completions
@@ -346,8 +344,8 @@ module Computation = struct
   let capture t fn x =
     (* Intentionally manually inlined [try_capture] to minimize stack usage *)
     (match fn x with
-    | y -> try_return t y
-    | exception exn -> try_capture_raised exn t)
+      | y -> try_return t y
+      | exception exn -> try_capture_raised exn t)
     |> ignore
 
   let[@inline never] raise (Canceled { exn; bt; _ } : (_, [ `Canceled ]) st) =

lib/picos_aux.htbl/picos_aux_htbl.ml

@@ -146,15 +146,14 @@ let rec copy_all r target i t step =
      [compare_and_set] below does not disrupt the next resize. *)
   Atomic.get t == r
   && begin
-       begin
-         match before with
-         | Resize _ ->
-             Atomic_array.unsafe_compare_and_set target i (B before) (B spine)
-             |> ignore
-         | Nil | Cons _ -> ()
-       end;
-       i = 0 || copy_all r target i t step
-     end
+    begin match before with
+    | Resize _ ->
+        Atomic_array.unsafe_compare_and_set target i (B before) (B spine)
+        |> ignore
+    | Nil | Cons _ -> ()
+    end;
+    i = 0 || copy_all r target i t step
+  end
 
 (* *)
 
@@ -179,24 +178,21 @@ let rec split_all r target i t step =
      resize. *)
   Atomic.get t == r
   && begin
-       begin
-         match before_lo with
-         | Resize _ ->
-             Atomic_array.unsafe_compare_and_set target i (B before_lo)
-               (B after_lo)
-             |> ignore
-         | Nil | Cons _ -> ()
-       end;
-       begin
-         match before_hi with
-         | Resize _ ->
-             Atomic_array.unsafe_compare_and_set target (i + high) (B before_hi)
-               (B after_hi)
-             |> ignore
-         | Nil | Cons _ -> ()
-       end;
-       i = 0 || split_all r target i t step
-     end
+    begin match before_lo with
+    | Resize _ ->
+        Atomic_array.unsafe_compare_and_set target i (B before_lo) (B after_lo)
+        |> ignore
+    | Nil | Cons _ -> ()
+    end;
+    begin match before_hi with
+    | Resize _ ->
+        Atomic_array.unsafe_compare_and_set target (i + high) (B before_hi)
+          (B after_hi)
+        |> ignore
+    | Nil | Cons _ -> ()
+    end;
+    i = 0 || split_all r target i t step
+  end
 
 (* *)
 
@@ -217,15 +213,14 @@ let rec merge_all r target i t step =
      [compare_and_set] below does not disrupt the next resize. *)
   Atomic.get t == r
   && begin
-       begin
-         match before with
-         | Resize _ ->
-             Atomic_array.unsafe_compare_and_set target i (B before) (B after)
-             |> ignore
-         | Nil | Cons _ -> ()
-       end;
-       i = 0 || merge_all r target i t step
-     end
+    begin match before with
+    | Resize _ ->
+        Atomic_array.unsafe_compare_and_set target i (B before) (B after)
+        |> ignore
+    | Nil | Cons _ -> ()
+    end;
+    i = 0 || merge_all r target i t step
+  end
 
 (* *)
 
@@ -277,9 +272,9 @@ let[@inline never] try_resize t r new_capacity ~clear =
   let new_r = { r with pending = Resize { buckets; non_linearizable_size } } in
   Atomic.compare_and_set t r new_r
   && begin
-       finish t new_r |> ignore;
-       true
-     end
+    finish t new_r |> ignore;
+    true
+  end
 
 (** This only gives an "estimate" of the size, which can be off by one or more
     and even be negative, so this must be used with care. *)

lib/picos_aux.mpmcq/picos_aux_mpmcq.ml

@@ -61,15 +61,14 @@ let rec push t value backoff = function
             let backoff = Backoff.once backoff in
             push t value backoff (Atomic.fenceless_get t.tail)
       | Snoc move_r as move ->
-          begin
-            match Atomic.get t.head with
-            | H (Head head_r as head) when head_r.counter < move_r.counter ->
-                let after = rev move in
-                if
-                  Atomic.fenceless_get t.head == H head
-                  && Atomic.compare_and_set t.head (H head) (H after)
-                then tail_r.move <- Used
-            | _ -> tail_r.move <- Used
+          begin match Atomic.get t.head with
+          | H (Head head_r as head) when head_r.counter < move_r.counter ->
+              let after = rev move in
+              if
+                Atomic.fenceless_get t.head == H head
+                && Atomic.compare_and_set t.head (H head) (H after)
+              then tail_r.move <- Used
+          | _ -> tail_r.move <- Used
           end;
           push t value backoff (Atomic.get t.tail)
     end
@@ -171,16 +170,14 @@ let rec push_head t value backoff =
               end
               else push_head t value backoff
           | Snoc move_r as move ->
-              begin
-                match Atomic.get t.head with
-                | H (Head head_r as head) when head_r.counter < move_r.counter
-                  ->
-                    let after = rev move in
-                    if
-                      Atomic.fenceless_get t.head == H head
-                      && Atomic.compare_and_set t.head (H head) (H after)
-                    then tail_r.move <- Used
-                | _ -> tail_r.move <- Used
+              begin match Atomic.get t.head with
+              | H (Head head_r as head) when head_r.counter < move_r.counter ->
+                  let after = rev move in
+                  if
+                    Atomic.fenceless_get t.head == H head
+                    && Atomic.compare_and_set t.head (H head) (H after)
+                  then tail_r.move <- Used
+              | _ -> tail_r.move <- Used
               end;
               push_head t value backoff
         end

lib/picos_io.select/picos_io_select.ml

@@ -137,9 +137,9 @@ let key =
 let[@poll error] [@inline never] try_transition s from into =
   s.state == from
   && begin
-       s.state <- into;
-       true
-     end
+    s.state <- into;
+    true
+  end
 
 let[@poll error] [@inline never] transition s into =
   let from = s.state in
@@ -282,16 +282,15 @@ let select_thread s =
       [ Sys.sigchld ]
     |> ignore
   end;
-  begin
-    try
-      let pipe_inn, pipe_out = Unix.pipe ~cloexec:true () in
-      s.pipe_inn <- pipe_inn;
-      s.pipe_out <- pipe_out;
-      if try_transition s `Starting `Alive then
-        select_thread s (-1.0) fos_empty fos_empty fos_empty
-    with exn ->
-      let bt = Printexc.get_raw_backtrace () in
-      s.exn_bt <- (exn, bt)
+  begin try
+    let pipe_inn, pipe_out = Unix.pipe ~cloexec:true () in
+    s.pipe_inn <- pipe_inn;
+    s.pipe_out <- pipe_out;
+    if try_transition s `Starting `Alive then
+      select_thread s (-1.0) fos_empty fos_empty fos_empty
+  with exn ->
+    let bt = Printexc.get_raw_backtrace () in
+    s.exn_bt <- (exn, bt)
   end;
   transition s `Stopped |> ignore;
   if s.pipe_inn != Unix.stdin then Unix.close s.pipe_inn;
@@ -301,13 +300,13 @@ let[@poll error] [@inline never] try_configure ~intr_sig ~intr_sigs
     ~handle_sigchld ~ignore_sigpipe =
   config.intr_sigs == []
   && begin
-       config.bits <-
-         Bool.to_int handle_sigchld
-         lor (ignore_sigpipe_bit land -Bool.to_int ignore_sigpipe);
-       config.intr_sig <- intr_sig;
-       config.intr_sigs <- intr_sigs;
-       true
-     end
+    config.bits <-
+      Bool.to_int handle_sigchld
+      lor (ignore_sigpipe_bit land -Bool.to_int ignore_sigpipe);
+    config.intr_sig <- intr_sig;
+    config.intr_sigs <- intr_sigs;
+    true
+  end
 
 let is_intr_sig signum = signum = config.intr_sig
 
@@ -485,12 +484,11 @@ module Intr = struct
     (* [intr_pending] must be read before [r.unused]! *)
     r.unused && before.req != R req
     && begin
-         use before.req;
-         let after = { value = before.value + 1; req = R req } in
-         if Atomic.compare_and_set intr_pending before after then
-           after.value = 1
-         else incr_once req (Backoff.once backoff)
-       end
+      use before.req;
+      let after = { value = before.value + 1; req = R req } in
+      if Atomic.compare_and_set intr_pending before after then after.value = 1
+      else incr_once req (Backoff.once backoff)
+    end
 
   let intr_action trigger (Req r as req : [ `Req ] tdt) id =
     match Computation.peek_exn r.computation with