ocamlformat 0.17

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

Author: rgrinberg

.github/workflows/build-and-test.yml

@@ -66,7 +66,7 @@ jobs:
         if: steps.cache-opam.outputs.cache-hit != 'true'
         run: |
           opam install . --with-doc --with-test --locked --ignore-constraints-on=ocaml
-          opam install ocamlformat.0.15.1 --skip-updates
+          opam install ocamlformat.0.17.0 --skip-updates
 
       - name: Fix broken opam state
         if: steps.cache-opam.outputs.cache-hit == 'true'

.ocamlformat

@@ -1,4 +1,4 @@
-version=0.15.1
+version=0.17.0
 break-separators=before
 dock-collection-brackets=false
 break-sequences=true

fiber-test/fiber_test.ml

@@ -47,8 +47,8 @@ let test ?(expect_never = false) to_dyn f =
     in
     Fiber.with_error_handler (fun () -> f) ~on_error
   in
-  ( try Scheduler.run (Scheduler.create ()) f |> to_dyn |> print_dyn
-    with Scheduler.Never -> never_raised := true );
+  (try Scheduler.run (Scheduler.create ()) f |> to_dyn |> print_dyn with
+  | Scheduler.Never -> never_raised := true);
   match (!never_raised, expect_never) with
   | false, false ->
     (* We don't raise in this case b/c we assume something else is being tested *)

fiber-unix/src/barrier.ml

@@ -28,8 +28,10 @@ let close t =
   | Closed -> ()
   | Active { mutex; await_mutex = _; r; w; buf = _ } ->
     Mutex.lock mutex;
-    (try Unix.close w with Unix.Unix_error _ -> ());
-    (try Unix.close r with Unix.Unix_error _ -> ());
+    (try Unix.close w with
+    | Unix.Unix_error _ -> ());
+    (try Unix.close r with
+    | Unix.Unix_error _ -> ());
     t := Closed;
     Mutex.unlock mutex
 
@@ -50,7 +52,7 @@ let rec drain_pipe fd buf read_once =
     match select fd 0. with
     | Ok `Empty -> Ok ()
     | Ok `Ready_to_read -> drain_pipe fd buf read_once
-    | Error `Closed -> Error (`Closed (`Read read_once)) )
+    | Error `Closed -> Error (`Closed (`Read read_once)))
   | _ -> assert false
 
 let await ?(timeout = -1.) t =
@@ -72,4 +74,4 @@ let signal t =
       close t;
       Error `Closed
     | 1 -> Ok ()
-    | _ -> assert false )
+    | _ -> assert false)

fiber-unix/src/fiber_stream.ml

@@ -24,7 +24,7 @@ module In = struct
     | Some x -> (
       match f x with
       | None -> filter_map t ~f ()
-      | Some y -> Fiber.return (Some y) )
+      | Some y -> Fiber.return (Some y))
 
   let map t ~f = filter_map t ~f:(fun x -> Some (f x))
 

fiber-unix/src/import.ml

@@ -27,13 +27,12 @@ module Log = struct
   let log ?section k =
     if !level section then (
       let message = k () in
-      ( match section with
+      (match section with
       | None -> Format.fprintf !out "%s@." message.message
-      | Some section -> Format.fprintf !out "[%s] %s@." section message.message
-      );
-      ( match message.payload with
+      | Some section -> Format.fprintf !out "[%s] %s@." section message.message);
+      (match message.payload with
       | [] -> ()
-      | fields -> Format.fprintf !out "%a@." Json.pp (`Assoc fields) );
+      | fields -> Format.fprintf !out "%a@." Json.pp (`Assoc fields));
       Format.pp_print_flush !out ()
     )
 end

fiber-unix/src/removable_queue.ml

@@ -52,15 +52,15 @@ let pop (type a) (t : a t) : a option =
 
 let remove node =
   if Option.is_some node.queue then (
-    ( match (node.next, node.prev) with
+    (match (node.next, node.prev) with
     | None, None -> Option.value_exn node.queue := Empty
     | _, _ -> (
-      ( match node.next with
+      (match node.next with
       | None -> ()
-      | Some next -> next.prev <- node.prev );
+      | Some next -> next.prev <- node.prev);
       match node.prev with
       | None -> ()
-      | Some prev -> prev.next <- node.next ) );
+      | Some prev -> prev.next <- node.next));
     node.prev <- None;
     node.next <- None;
     node.queue <- None

fiber-unix/src/scheduler.ml

@@ -44,7 +44,7 @@ end = struct
       | Stopped _ -> (
         match Removable_queue.pop t.work with
         | None -> t.state <- Finished
-        | Some job -> do_work job )
+        | Some job -> do_work job)
       | Finished -> ()
       | Running _ -> (
         match Removable_queue.pop t.work with
@@ -53,7 +53,7 @@ end = struct
           while Removable_queue.is_empty t.work && is_running t do
             Condition.wait t.work_available t.mutex
           done;
-          loop () )
+          loop ())
     and do_work job =
       Mutex.unlock t.mutex;
       f job;
@@ -175,9 +175,9 @@ let time_loop t =
               else
                 earliest_next :=
                   Some
-                    ( match !earliest_next with
+                    (match !earliest_next with
                     | None -> scheduled_at
-                    | Some v -> min scheduled_at v );
+                    | Some v -> min scheduled_at v);
               not need_to_run));
     let to_run =
       List.sort !to_run ~compare:(fun x y ->
@@ -220,7 +220,7 @@ let wake_loop t =
         else (
           signal_timers_available t;
           loop None
-        ) )
+        ))
   in
   loop None
 

fiber-unix/test/barrier_tests.ml

@@ -4,10 +4,10 @@ let () = Printexc.record_backtrace false
 
 let print_result x =
   print_endline
-    ( match x with
+    (match x with
     | Ok () -> "ok"
     | Error (`Closed (`Read b)) -> Printf.sprintf "closed with read: %b" b
-    | Error `Timeout -> "timeout" )
+    | Error `Timeout -> "timeout")
 
 let print_signal x =
   match x with

jsonrpc-fiber/src/import.ml

@@ -104,9 +104,8 @@ module Json = struct
     let untagged_union (type a) name (xs : (t -> a) list) (json : t) : a =
       match
         List.find_map xs ~f:(fun conv ->
-            try Some (conv json)
-            with Ppx_yojson_conv_lib.Yojson_conv.Of_yojson_error (_, _) ->
-              None)
+            try Some (conv json) with
+            | Ppx_yojson_conv_lib.Yojson_conv.Of_yojson_error (_, _) -> None)
       with
       | None -> error name json
       | Some x -> x
@@ -128,7 +127,7 @@ module Json = struct
         match ks with
         | [] -> error (sprintf "%s: key %s not found" name k) json
         | [ _ ] -> f (`Assoc xs)
-        | _ :: _ -> error (sprintf "%s: multiple keys %s" name k) json )
+        | _ :: _ -> error (sprintf "%s: multiple keys %s" name k) json)
       | _ -> error (sprintf "%s: not a record (key: %s)" name k) json
   end
 
@@ -223,13 +222,12 @@ module Log = struct
   let log ?section k =
     if !level section then (
       let message = k () in
-      ( match section with
+      (match section with
       | None -> Format.fprintf !out "%s@." message.message
-      | Some section -> Format.fprintf !out "[%s] %s@." section message.message
-      );
-      ( match message.payload with
+      | Some section -> Format.fprintf !out "[%s] %s@." section message.message);
+      (match message.payload with
       | [] -> ()
-      | fields -> Format.fprintf !out "%a@." Json.pp (`Assoc fields) );
+      | fields -> Format.fprintf !out "%a@." Json.pp (`Assoc fields));
       Format.pp_print_flush !out ()
     )
 end