Merge pull request #818 from Julow/remove-option-lwt

Remove uses of Ocsigen_lib Option.Lwt and Dlist.lwt_fold

Author: smorimoto

src/lib/eliom_state.server.ml

@@ -1361,6 +1361,11 @@ module Ext = struct
     let a = fold_sub_states_aux_aux ?sitedata ~state:state' f in
     fold_sub_states_aux Ocsigen_cache.Dlist.fold Ocsigen_lib.id a e state
 
+  (** Fold over the snapshot of a Dlist. *)
+  let dlist_lwt_fold f acc dlist =
+    Ocsigen_cache.Dlist.fold (fun acc x -> x :: acc) [] dlist
+    |> List.rev |> Lwt_list.fold_left_s f acc
+
   let fold_sub_states ?sitedata ~state f e =
     let ((sitedata, sub_states_level, id, f) as a) =
       fold_sub_states_aux_aux ?sitedata ~state f
@@ -1373,7 +1378,7 @@ module Ext = struct
              (Eliom_common.get_site_dir_string sitedata)
              (Some id))
         >>= fun l -> Lwt_list.fold_left_s f e l
-    | _ -> fold_sub_states_aux Ocsigen_cache.Dlist.lwt_fold Lwt.return a e state
+    | _ -> fold_sub_states_aux dlist_lwt_fold Lwt.return a e state
 
   let iter_volatile_sub_states ?sitedata ~state f =
     fold_volatile_sub_states ?sitedata ~state (fun () -> f) ()

src/lib/server/eliommod_cookies.ml

@@ -89,23 +89,29 @@ module Persistent_cookies = struct
           else Some (cookies_str ^ "," ^ cookie)
 
     let remove_cookie exp_o cookie =
-      exp_o
-      |> Eliom_lib.Option.Lwt.iter @@ fun exp ->
-         modify_opt exp @@ function
-         | None -> None
-         | Some cookies_str ->
-             let cookies = String.split_on_char ',' cookies_str in
-             let cookies' = List.filter (fun c -> c <> cookie) cookies in
-             if cookies' = [] then None else Some (String.concat "," cookies')
+      match exp_o with
+      | None -> Lwt.return_unit
+      | Some exp -> (
+          modify_opt exp @@ function
+          | None -> None
+          | Some cookies_str ->
+              let cookies = String.split_on_char ',' cookies_str in
+              let cookies' = List.filter (fun c -> c <> cookie) cookies in
+              if cookies' = [] then None else Some (String.concat "," cookies'))
   end
 
   let add cookie ({expiry; _} as content) =
-    Eliom_lib.Option.Lwt.iter (fun t -> Expiry_dates.add_cookie t cookie) expiry
-    >>= fun _ -> Cookies.add cookie content
+    match expiry with
+    | Some t ->
+        Expiry_dates.add_cookie t cookie >>= fun _ -> Cookies.add cookie content
+    | None -> Lwt.return_unit
 
   let replace_if_exists cookie ({expiry; _} as content) =
-    Eliom_lib.Option.Lwt.iter (fun t -> Expiry_dates.add_cookie t cookie) expiry
-    >>= fun _ -> Cookies.replace_if_exists cookie content
+    match expiry with
+    | Some t ->
+        Expiry_dates.add_cookie t cookie >>= fun _ ->
+        Cookies.replace_if_exists cookie content
+    | None -> Lwt.return_unit
 
   let garbage_collect ~section gc_cookie =
     let now = Unix.time () in