Translate 'Lwt_io.flush'

Author: Julow

bin/lwt_to_direct_style/ast_rewrite.ml

@@ -385,6 +385,7 @@ let rewrite_apply ~backend ~state full_ident args =
       take @@ fun str -> return (Some (backend#io_write_str chan str))
   | "Lwt_io", "length" -> take @@ fun fd -> return (Some (backend#io_length fd))
   | "Lwt_io", "close" -> take @@ fun fd -> return (Some (backend#io_close fd))
+  | "Lwt_io", "flush" -> take @@ fun fd -> return (Some (backend#io_flush fd))
   | "Lwt_main", "run" ->
       take @@ fun promise -> return (Some (backend#main_run promise))
   | _ -> return None

bin/lwt_to_direct_style/concurrency_backend.ml

@@ -233,6 +233,9 @@ let eio ~eio_sw_as_fiber_var ~eio_env_as_fiber_var add_comment =
          unbuffered IO.";
       None
 
+    method io_flush output =
+      mk_apply_simple [ "Eio"; "Buf_write"; "flush" ] [ output ]
+
     method fd_close fd =
       (* TODO: See [of_unix_file_descr]. mk_apply_simple [ "Eio_unix"; "Fd" ] [ fd ] *)
       mk_apply_simple [ "Unix"; "close" ] [ fd ]

test/lwt_to_direct_style/to_direct_style.t/run.t

@@ -228,41 +228,42 @@ Make a writable directory tree:
     Lwt_mutex.lock (line 136 column 9)
     Lwt_mutex.unlock (line 137 column 9)
     Lwt_mutex.with_lock (line 138 column 9)
-  lib/test_lwt_unix.ml: (40 occurrences)
+  lib/test_lwt_unix.ml: (41 occurrences)
     Lwt_io (line 7 column 8)
     Lwt.return (line 12 column 3)
     Lwt.let* (line 10 column 3)
     Lwt.let* (line 11 column 3)
-    Lwt.let* (line 32 column 3)
-    Lwt.let* (line 36 column 3)
+    Lwt.let* (line 29 column 3)
+    Lwt.let* (line 33 column 3)
     Lwt.Syntax (line 1 column 6)
-    Lwt_io.Input (line 23 column 32)
-    Lwt_io.Output (line 24 column 32)
+    Lwt_io.Input (line 22 column 32)
+    Lwt_io.Output (line 23 column 32)
     Lwt_io.input (line 7 column 28)
-    Lwt_io.input (line 32 column 36)
-    Lwt_io.output (line 22 column 32)
-    Lwt_io.output (line 36 column 36)
-    Lwt_io.output_channel (line 27 column 9)
-    Lwt_io.close (line 33 column 3)
+    Lwt_io.input (line 29 column 36)
+    Lwt_io.output (line 21 column 32)
+    Lwt_io.output (line 33 column 36)
+    Lwt_io.output_channel (line 25 column 9)
+    Lwt_io.close (line 30 column 3)
     Lwt_io.of_fd (line 7 column 16)
+    Lwt_io.of_fd (line 21 column 13)
     Lwt_io.of_fd (line 22 column 13)
     Lwt_io.of_fd (line 23 column 13)
-    Lwt_io.of_fd (line 24 column 13)
-    Lwt_io.read_line (line 29 column 15)
-    Lwt_io.read (line 42 column 15)
-    Lwt_io.read (line 43 column 15)
-    Lwt_io.read (line 44 column 15)
-    Lwt_io.read_into (line 10 column 19)
+    Lwt_io.read_line (line 26 column 15)
+    Lwt_io.read (line 38 column 15)
+    Lwt_io.read (line 39 column 15)
+    Lwt_io.read (line 40 column 15)
+    Lwt_io.read_into (line 10 column 21)
     Lwt_io.read_into_exactly (line 11 column 13)
-    Lwt_io.write (line 25 column 19)
-    Lwt_io.length (line 37 column 3)
-    Lwt_io.stdout (line 27 column 33)
-    Lwt_io.open_file (line 32 column 13)
-    Lwt_io.open_file (line 36 column 13)
+    Lwt_io.flush (line 41 column 15)
+    Lwt_io.write (line 24 column 19)
+    Lwt_io.length (line 34 column 3)
+    Lwt_io.stdout (line 25 column 33)
+    Lwt_io.open_file (line 29 column 13)
+    Lwt_io.open_file (line 33 column 13)
     Lwt_unix.Timeout (line 14 column 9)
     Lwt_unix.of_unix_file_descr (line 6 column 8)
-    Lwt_unix.stat (line 39 column 16)
-    Lwt_unix.lstat (line 40 column 16)
+    Lwt_unix.stat (line 36 column 16)
+    Lwt_unix.lstat (line 37 column 16)
     Lwt_unix.sockaddr (line 15 column 9)
     Lwt_unix.ADDR_UNIX (line 15 column 29)
     Lwt_unix.ADDR_UNIX (line 17 column 6)
@@ -300,9 +301,9 @@ Make a writable directory tree:
     Lwt.let* (line 163 column 21)
     Lwt.Fail (line 179 column 9)
   Warning: lib/test_lwt_unix.ml: 3 occurrences have not been rewritten.
-    Lwt_io.stdout (line 27 column 33)
-    Lwt_io.read (line 43 column 15)
-    Lwt_io.read (line 44 column 15)
+    Lwt_io.stdout (line 25 column 33)
+    Lwt_io.read (line 39 column 15)
+    Lwt_io.read (line 40 column 15)
   Warning: lib/test.mli: 2 occurrences have not been rewritten.
     Lwt_mutex.t (line 2 column 10)
     Lwt_mutex.t (line 3 column 10)
@@ -693,7 +694,7 @@ Make a writable directory tree:
           : [ `R | `Flow | `Close ] r)
     in
     let buf = Bytes.create 1024 in
-    let _n : int =
+    let (_n : int) =
       Eio.Flow.single_read
         (* TODO: lwt-to-direct-style: [buf] should be a [Cstruct.t]. *)
         (* TODO: lwt-to-direct-style: [Eio.Flow.single_read] operates on a [Flow.source] but [inp] is likely of type [Eio.Buf_read.t]. Rewrite this code to use [Buf_read] (which contains an internal buffer) or change the call to [Eio.Buf_read.of_flow] used to create the buffer. *)
@@ -801,3 +802,5 @@ Make a writable directory tree:
     (* TODO: lwt-to-direct-style: Eio doesn't have a direct equivalent of [Lwt_io.read ~count]. Rewrite the code using [Eio.Buf_read]'s lower level API or switch to unbuffered IO. *)
     (* TODO: lwt-to-direct-style: Eio doesn't have a direct equivalent of [Lwt_io.read ~count]. Rewrite the code using [Eio.Buf_read]'s lower level API or switch to unbuffered IO. *)
       ?count:(Some 42) chan
+  
+  let _f chan = Eio.Buf_write.flush chan

test/lwt_to_direct_style/to_direct_style.t/src/lib/test_lwt_unix.ml

@@ -7,7 +7,7 @@ let _f fname =
     |> Lwt_io.(of_fd ~mode:input)
   in
   let buf = Bytes.create 1024 in
-  let* _n : int = Lwt_io.read_into inp buf 0 1024 in
+  let* (_n : int) = Lwt_io.read_into inp buf 0 1024 in
   let* () = Lwt_io.read_into_exactly inp buf 0 1024 in
   Lwt.return ()
 
@@ -18,14 +18,11 @@ let (Lwt_unix.ADDR_UNIX _ | ADDR_INET _) =
   Lwt_unix.ADDR_INET (Unix.inet_addr_any, 0)
 
 let _ = Lwt_unix.getaddrinfo
-
 let _f fd = Lwt_io.of_fd ~mode:Lwt_io.output fd
 let _f fd = Lwt_io.of_fd ~mode:Lwt_io.Input fd
 let _f fd = Lwt_io.of_fd ~mode:Lwt_io.Output fd
 let _f out_chan = Lwt_io.write out_chan "str"
-
 let _ : Lwt_io.output_channel = Lwt_io.stdout
-
 let _f chan = Lwt_io.read_line chan
 
 let _f fname =
@@ -38,7 +35,7 @@ let _f fname =
 
 let _f fname = Lwt_unix.stat fname
 let _f fname = Lwt_unix.lstat fname
-
 let _f chan = Lwt_io.read chan
 let _f chan = Lwt_io.read ~count:42 chan
 let _f chan = Lwt_io.read ?count:(Some 42) chan
+let _f chan = Lwt_io.flush chan