Automatic changes done with lwt-to-direct-style

Author: Julow

src/baselib/ocsigen_cache.ml

@@ -1,3 +1,5 @@
+open Eio.Std
+
 (* Ocsigen
  * Copyright (C) 2009
  *
@@ -22,8 +24,6 @@
    @author Raphaël Proust (adding timers)
 *)
 
-open Lwt.Infix
-
 module Dlist : sig
   type 'a t
   type 'a node
@@ -120,7 +120,7 @@ end = struct
     ; mutable finaliser_after : 'a node -> unit
     ; time_bound : time_bound option }
 
-  and time_bound = {timer : float; mutable collector : unit Lwt.t option}
+  and time_bound = {timer : float; mutable collector : unit Promise.t option}
 
   (* Checks (by BY):
 
@@ -214,7 +214,7 @@ end = struct
     | None -> assert false (* collection is set to None and collector to Some *)
     | Some t ->
         let duration = t -. Unix.gettimeofday () in
-        if duration <= 0. then Lwt.return () else Lwt_unix.sleep duration
+        if duration <= 0. then () else Eio_unix.sleep duration
 
   (* a function to set the collector. *)
   let rec update_collector r =
@@ -227,11 +227,10 @@ end = struct
       | Some n ->
           t.collector <-
             Some
-              ( sleep_until n.collection >>= fun () ->
-                collect r n;
-                t.collector <- None;
-                update_collector r;
-                Lwt.return () ))
+              (sleep_until n.collection;
+               collect r n;
+               t.collector <- None;
+               update_collector r))
 
   (* Add a node that do not belong to any list to a list.
      The fields [succ] and [prev] are overridden.
@@ -399,7 +398,7 @@ functor
     type t =
       { mutable pointers : A.key Dlist.t
       ; mutable table : (A.value * A.key Dlist.node) H.t
-      ; finder : A.key -> A.value Lwt.t
+      ; finder : A.key -> A.value
       ; clear : unit -> unit
         (* This function clears the cache. It is put inside the
                                cache structure so that it is garbage-collected only when the cache
@@ -460,14 +459,14 @@ functor
     let size c = Dlist.size c.pointers
 
     let find cache k =
-      try Lwt.return (find_in_cache cache k)
+      try find_in_cache cache k
       with Not_found ->
-        cache.finder k >>= fun r ->
+        let r = cache.finder k in
         (try
            (* it may have been added during cache.finder *)
            ignore (find_in_cache cache k : A.value)
          with Not_found -> add_no_remove cache k r);
-        Lwt.return r
+        r
 
     class cache f ?timer size_c =
       let c = create f ?timer size_c in

src/baselib/ocsigen_cache.mli

@@ -53,8 +53,8 @@ module Make : functor
         Using [timer] allow one to create a cache
         bounded both in space and time. It is to be noted that real lifespan
         of values is always slightly greater than [timer]. *)
-  class cache : (A.key -> A.value Lwt.t) -> ?timer:float -> int -> object
-    method find : A.key -> A.value Lwt.t
+  class cache : (A.key -> A.value) -> ?timer:float -> int -> object
+    method find : A.key -> A.value
     (** Find the cached value associated to the key, or binds this
             value in the cache using the function [finder] passed as argument
             to [create], and returns this value *)

src/baselib/ocsigen_lib.ml

@@ -26,17 +26,18 @@ module Ip_address = struct
 
   let get_inet_addr ?(v6 = false) host =
     let rec aux = function
-      | [] -> Lwt.fail No_such_host
-      | {Unix.ai_addr = Unix.ADDR_INET (inet_addr, _); _} :: _ ->
-          Lwt.return inet_addr
+      | [] -> raise No_such_host
+      | {Unix.ai_addr = Unix.ADDR_INET (inet_addr, _); _} :: _ -> inet_addr
       | _ :: l -> aux l
     in
     let options =
-      [ (if v6
-         then Lwt_unix.AI_FAMILY Lwt_unix.PF_INET6
-         else Lwt_unix.AI_FAMILY Lwt_unix.PF_INET) ]
+      [ (if v6 then Unix.AI_FAMILY Unix.PF_INET6 else Unix.AI_FAMILY Unix.PF_INET)
+      ]
     in
-    Lwt.bind (Lwt_unix.getaddrinfo host "" options) aux
+    aux
+      (Unix.getaddrinfo
+         (* TODO: lwt-to-direct-style: This call to [Unix.getaddrinfo] was [Lwt_unix.getaddrinfo] before the rewrite. *)
+         host "" options)
 end
 
 (*****************************************************************************)

src/baselib/ocsigen_lib.mli

@@ -39,7 +39,7 @@ module String : module type of String_base
 module Ip_address : sig
   exception No_such_host
 
-  val get_inet_addr : ?v6:bool -> string -> Unix.inet_addr Lwt.t
+  val get_inet_addr : ?v6:bool -> string -> Unix.inet_addr
 end
 
 module Filename : sig

src/baselib/ocsigen_lib_base.ml

@@ -23,8 +23,6 @@ exception Ocsigen_Request_too_long
 
 external id : 'a -> 'a = "%identity"
 
-include Lwt.Infix
-
 let ( !! ) = Lazy.force
 let ( |> ) x f = f x
 let ( @@ ) f x = f x
@@ -47,8 +45,7 @@ type yesnomaybe = Yes | No | Maybe
 type ('a, 'b) leftright = Left of 'a | Right of 'b
 
 let advert =
-  "Page generated by OCaml with Ocsigen.
-See http://ocsigen.org/ and http://caml.inria.fr/ for information"
+  "Page generated by OCaml with Ocsigen.\nSee http://ocsigen.org/ and http://caml.inria.fr/ for information"
 
 (*****************************************************************************)
 

src/baselib/ocsigen_lib_base.mli

@@ -26,8 +26,6 @@ exception Input_is_too_large
 exception Ocsigen_Bad_Request
 exception Ocsigen_Request_too_long
 
-include module type of Lwt.Infix
-
 val ( !! ) : 'a Lazy.t -> 'a
 val ( |> ) : 'a -> ('a -> 'b) -> 'b
 val ( @@ ) : ('a -> 'b) -> 'a -> 'b