chore: update flakes and ocamlformat (#186)

bin/carl.ml

@@ -126,7 +126,7 @@ let rec uri_of_string ~scheme s =
     (* If Uri.of_string didn't get a host it must mean that the scheme wasn't
      * even present. *)
     Logs.debug (fun m ->
-        m "Protocol not provided for %s. Using the default scheme: %s" s scheme);
+      m "Protocol not provided for %s. Using the default scheme: %s" s scheme);
     uri_of_string ~scheme ("//" ^ s)
   | Some _, None ->
     (* e.g. `//example.com` *)
@@ -245,18 +245,18 @@ let handle_response
     | Channel filename ->
       (try
          Eio_unix.run_in_systhread (fun () ->
-             let fd =
-               Unix.openfile
-                 filename
-                 Unix.[ O_NONBLOCK; O_WRONLY; O_TRUNC; O_CREAT ]
-                 0o600
-             in
-             let fd = Eio_unix.Fd.of_unix ~sw ~close_unix:true fd in
-             Ok
-               ( fd
-               , Format.formatter_of_out_channel
-                   (Unix.out_channel_of_descr
-                      (Eio_unix.Fd.use_exn "handle_response" fd Fun.id)) ))
+           let fd =
+             Unix.openfile
+               filename
+               Unix.[ O_NONBLOCK; O_WRONLY; O_TRUNC; O_CREAT ]
+               0o600
+           in
+           let fd = Eio_unix.Fd.of_unix ~sw ~close_unix:true fd in
+           Ok
+             ( fd
+             , Format.formatter_of_out_channel
+                 (Unix.out_channel_of_descr
+                    (Eio_unix.Fd.use_exn "handle_response" fd Fun.id)) ))
        with
       | exn -> Error (`Exn exn))
   in
@@ -268,8 +268,8 @@ let handle_response
     if head
     then (
       Fiber.fork ~sw (fun () ->
-          let (_ : (unit, _) result) = Body.drain body in
-          ());
+        let (_ : (unit, _) result) = Body.drain body in
+        ());
       ok)
     else
       match compressed, Headers.get response.headers "content-encoding" with
@@ -317,7 +317,7 @@ let handle_response
   | Stdout | Channel "-" -> Format.pp_print_newline formatter ()
   | Channel _ ->
     Eio_unix.run_in_systhread (fun () ->
-        Unix.close (Eio_unix.Fd.use_exn "close" channel Fun.id)));
+      Unix.close (Eio_unix.Fd.use_exn "close" channel Fun.id)));
   result
 
 let build_headers
@@ -337,8 +337,8 @@ let build_headers
   match oauth2_bearer, user with
   | Some token, _ ->
     Logs.debug (fun m ->
-        let user = match user with Some user -> user | None -> "''" in
-        m "Server authorization using Bearer with user %s" user);
+      let user = match user with Some user -> user | None -> "''" in
+      m "Server authorization using Bearer with user %s" user);
     (* Bearer token overrides `user` *)
     ("Authorization", "Bearer " ^ token) :: headers
   | None, Some user ->
@@ -370,17 +370,17 @@ let request env ~sw ~cli ~config uri =
       let flow = Eio_unix.Net.import_socket_stream ~sw ~close_unix:true fd in
       let stream =
         Stream.from ~f:(fun () ->
-            if !remaining = 0
-            then None
-            else
-              let len = min config.Config.body_buffer_size !remaining in
-              let cs = Cstruct.create len in
-              Eio.Flow.read_exact flow cs;
-              remaining := !remaining - len;
-              Some { Faraday.buffer = cs.buffer; off = cs.off; len = cs.len })
+          if !remaining = 0
+          then None
+          else
+            let len = min config.Config.body_buffer_size !remaining in
+            let cs = Cstruct.create len in
+            Eio.Flow.read_exact flow cs;
+            remaining := !remaining - len;
+            Some { Faraday.buffer = cs.buffer; off = cs.off; len = cs.len })
       in
       Fiber.fork ~sw (fun () ->
-          Stream.when_closed ~f:(fun () -> Eio.Flow.close flow) stream);
+        Stream.when_closed ~f:(fun () -> Eio.Flow.close flow) stream);
       let body_length =
         match
           List.find_opt
@@ -469,7 +469,7 @@ let main ({ log_level; urls; _ } as cli) =
   | Error msg -> `Error (false, msg)
   | Ok config ->
     Eio_main.run (fun env ->
-        Eio.Switch.run (fun sw -> request_many ~sw ~cli ~config env urls))
+      Eio.Switch.run (fun sw -> request_many ~sw ~cli ~config env urls))
 
 (* --resolve <host:port:address[,address]...> Resolve the host+port to this address
  * --retry <num>   Retry request if transient problems occur

examples/docs/readme.ml

@@ -13,9 +13,9 @@ let get_sync env ~sw url =
 
 let () =
   Eio_main.run (fun env ->
-      Eio.Switch.run (fun sw ->
-          match get_sync env ~sw "https://example.com" with
-          | Ok body -> print_endline body
-          | Error error ->
-            let message = Error.to_string error in
-            prerr_endline ("Error: " ^ message)))
+    Eio.Switch.run (fun sw ->
+      match get_sync env ~sw "https://example.com" with
+      | Ok body -> print_endline body
+      | Error error ->
+        let message = Error.to_string error in
+        prerr_endline ("Error: " ^ message)))

examples/eio/echo_server_upgrade.ml

@@ -3,10 +3,10 @@ open Piaf
 
 let connection_handler { Server.request; _ } =
   Response.Upgrade.websocket request ~f:(fun wsd ->
-      let frames = Ws.Descriptor.messages wsd in
-      Stream.iter
-        ~f:(fun (_opcode, frame) -> Ws.Descriptor.send_iovec wsd frame)
-        frames)
+    let frames = Ws.Descriptor.messages wsd in
+    Stream.iter
+      ~f:(fun (_opcode, frame) -> Ws.Descriptor.send_iovec wsd frame)
+      frames)
   |> Result.get_ok
 
 let setup_log ?style_renderer level =
@@ -23,12 +23,12 @@ let () =
     ignore
     "Echoes websocket messages. Runs forever.";
   Eio_main.run (fun env ->
-      Switch.run (fun sw ->
-          let config =
-            Server.Config.create (`Tcp (Eio.Net.Ipaddr.V4.loopback, !port))
-          in
-          let server = Server.create ~config connection_handler in
-          let _command = Server.Command.start ~sw env server in
-          ()
-          (* Eio.Time.sleep (Eio.Stdenv.clock env) 5.; *)
-          (* Server.Command.shutdown command *)))
+    Switch.run (fun sw ->
+      let config =
+        Server.Config.create (`Tcp (Eio.Net.Ipaddr.V4.loopback, !port))
+      in
+      let server = Server.create ~config connection_handler in
+      let _command = Server.Command.start ~sw env server in
+      ()
+      (* Eio.Time.sleep (Eio.Stdenv.clock env) 5.; *)
+      (* Server.Command.shutdown command *)))

examples/eio/eio_echo_post.ml

@@ -40,12 +40,12 @@ let main port =
         (`Tcp (Eio.Net.Ipaddr.V4.loopback, port)))
   in
   Eio_main.run (fun env ->
-      Switch.run (fun sw ->
-          let server = Server.create ~config request_handler in
-          let _command = Server.Command.start ~sw env server in
-          ()
-          (* Eio.Time.sleep (Eio.Stdenv.clock env) 5.; *)
-          (* Server.Command.shutdown command *)))
+    Switch.run (fun sw ->
+      let server = Server.create ~config request_handler in
+      let _command = Server.Command.start ~sw env server in
+      ()
+      (* Eio.Time.sleep (Eio.Stdenv.clock env) 5.; *)
+      (* Server.Command.shutdown command *)))
 
 let setup_log ?style_renderer level =
   Fmt_tty.setup_std_outputs ?style_renderer ();

examples/eio/eio_get.ml

@@ -56,7 +56,7 @@ let () =
     | Some host -> host
   in
   Eio_main.run (fun env ->
-      Eio.Switch.run (fun sw ->
-          match request ~sw ~env host with
-          | Ok () -> ()
-          | Error e -> failwith (Piaf.Error.to_string e)))
+    Eio.Switch.run (fun sw ->
+      match request ~sw ~env host with
+      | Ok () -> ()
+      | Error e -> failwith (Piaf.Error.to_string e)))

examples/eio/eio_multidomain_server.ml

@@ -10,14 +10,14 @@ let start env =
   let host = Eio.Net.Ipaddr.V4.loopback
   and port = 8080 in
   Switch.run (fun sw ->
-      let config =
-        Server.Config.create
-          ~buffer_size:0x1000
-          ~domains:recommended_domain_count
-          (`Tcp (host, port))
-      in
-      let server = Server.create ~config connection_handler in
-      ignore (Server.Command.start ~sw env server : Server.Command.t))
+    let config =
+      Server.Config.create
+        ~buffer_size:0x1000
+        ~domains:recommended_domain_count
+        (`Tcp (host, port))
+    in
+    let server = Server.create ~config connection_handler in
+    ignore (Server.Command.start ~sw env server : Server.Command.t))
 
 let setup_log ?style_renderer level =
   Logs_threaded.enable ();

examples/eio/eio_server_get.ml

@@ -29,6 +29,6 @@ let setup_log ?style_renderer level =
 let () =
   setup_log (Some Info);
   Eio_main.run (fun env ->
-      Switch.run (fun sw ->
-          let _command = start ~sw env in
-          ()))
+    Switch.run (fun sw ->
+      let _command = start ~sw env in
+      ()))

examples/eio/eio_wscat.ml

@@ -34,15 +34,15 @@ let request ~env ~sw host =
   let+ wsd = Client.ws_upgrade client "/" in
   Fiber.both
     (fun () ->
-      let stdin = Eio.Stdenv.stdin env in
-      let buf = Eio.Buf_read.of_flow stdin ~initial_size:100 ~max_size:1_000 in
-      stdin_loop ~stdin buf wsd;
-      Client.shutdown client)
+       let stdin = Eio.Stdenv.stdin env in
+       let buf = Eio.Buf_read.of_flow stdin ~initial_size:100 ~max_size:1_000 in
+       stdin_loop ~stdin buf wsd;
+       Client.shutdown client)
     (fun () ->
-      Stream.iter
-        ~f:(fun (_opcode, { IOVec.buffer; off; len }) ->
-          Format.printf ">> %s@." (Bigstringaf.substring ~off ~len buffer))
-        (Ws.Descriptor.messages wsd))
+       Stream.iter
+         ~f:(fun (_opcode, { IOVec.buffer; off; len }) ->
+           Format.printf ">> %s@." (Bigstringaf.substring ~off ~len buffer))
+         (Ws.Descriptor.messages wsd))
 
 let setup_log ?style_renderer level =
   Fmt_tty.setup_std_outputs ?style_renderer ();
@@ -63,7 +63,7 @@ let () =
     | Some host -> host
   in
   Eio_main.run (fun env ->
-      Eio.Switch.run (fun sw ->
-          match request ~sw ~env host with
-          | Ok () -> ()
-          | Error e -> failwith (Piaf.Error.to_string e)))
+    Eio.Switch.run (fun sw ->
+      match request ~sw ~env host with
+      | Ok () -> ()
+      | Error e -> failwith (Piaf.Error.to_string e)))

flake.nix

@@ -4,7 +4,7 @@
   inputs.nix-filter.url = "github:numtide/nix-filter";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.nixpkgs = {
-    url = "github:nix-ocaml/nix-overlays/anmonteiro/eio-0.12";
+    url = "github:nix-ocaml/nix-overlays";
     inputs.flake-utils.follows = "flake-utils";
   };