Eliom_lib: Unify raise_error and raise_error_f

This makes logging error more regular accross client code and remove one
function from the toplevel namespace.

raise_error is almost always used with a string literal argument, making
it interchangeable with raise_error_f in practice.

Author: Julow

src/lib/client/eliommod_dom.ml

@@ -248,7 +248,7 @@ let slow_select_nodes (root : Dom_html.element Js.t) =
            | Dom_html.A e -> ignore a_array ## (push e)
            | Dom_html.Form e -> ignore form_array ## (push e)
            | _ ->
-               raise_error_f ~section "%s element tagged as eliom link"
+               raise_error ~section "%s element tagged as eliom link"
                  (Js.to_string node##.tagName));
         if process_node then ignore node_array ## (push node);
         if closure then ignore closure_array ## (push node);
@@ -349,8 +349,7 @@ let add_childrens (elt : Dom_html.element Js.t) (sons : Dom.node Js.t list) =
               match Dom.nodeType t with
               | Dom.Text t -> t
               | _ ->
-                  raise_error_f ~section
-                    "add_childrens: not text node in tag %s"
+                  raise_error ~section "add_childrens: not text node in tag %s"
                     (Js.to_string elt##.tagName)
             in
             concat acc ## (concat txt##.data) q

src/lib/eliom_client.client.ml

@@ -179,7 +179,7 @@ let a_handler =
   Dom_html.full_handler (fun node ev ->
     let node =
       Js.Opt.get (Dom_html.CoerceTo.a node) (fun () ->
-        raise_error_f ~section "not an anchor element")
+        raise_error ~section "not an anchor element")
     in
     (* We prevent default behaviour
           only if raw_a_handler has taken the change page itself *)
@@ -196,7 +196,7 @@ let form_handler :
   Dom_html.full_handler (fun node ev ->
     let form =
       Js.Opt.get (Dom_html.CoerceTo.form node) (fun () ->
-        raise_error_f ~section "not a form element")
+        raise_error ~section "not a form element")
     in
     let kind =
       if String.lowercase_ascii (Js.to_string form##._method) = "get"
@@ -213,7 +213,7 @@ let relink_process_node (node : Dom_html.element Js.t) =
   let id =
     Js.Opt.get
       node ## (getAttribute (Js.string Eliom_runtime.RawXML.node_id_attrib))
-      (fun () -> raise_error_f ~section "unique node without id attribute")
+      (fun () -> raise_error ~section "unique node without id attribute")
   in
   Js.Optdef.case
     (Eliom_client_core.find_process_node id)
@@ -240,7 +240,7 @@ let relink_request_node (node : Dom_html.element Js.t) =
   let id =
     Js.Opt.get
       node ## (getAttribute (Js.string Eliom_runtime.RawXML.node_id_attrib))
-      (fun () -> raise_error_f ~section "unique node without id attribute")
+      (fun () -> raise_error ~section "unique node without id attribute")
   in
   Js.Optdef.case
     (Eliom_client_core.find_request_node id)
@@ -373,7 +373,7 @@ let relink_attrib _root table (node : Dom_html.element Js.t) =
         in
         Eliom_client_core.rebuild_rattrib node rattrib
       with Not_found ->
-        raise_error_f ~section "relink_attrib: client value %s not found" cid
+        raise_error ~section "relink_attrib: client value %s not found" cid
   in
   Eliommod_dom.iter_attrList node##.attributes aux
 
@@ -398,10 +398,10 @@ let load_data_script page =
         match Js.to_bytestring data_script##.tagName##toLowerCase with
         | "script" -> Js.Unsafe.coerce data_script
         | t ->
-            raise_error_f ~section
+            raise_error ~section
               "Unable to find Eliom application data (script element expected, found %s element)"
               t)
-    | _ -> raise_error_f ~section "Unable to find Eliom application data."
+    | _ -> raise_error ~section "Unable to find Eliom application data."
   in
   let script = data_script##.text in
   if !Eliom_config.debug_timings
@@ -822,7 +822,7 @@ let get_state state_id : state =
           (* We use this only when the history API is
              available. Sessionstorage seems to be available
              everywhere the history API exists. *)
-          raise_error_f ~section "sessionStorage not available")
+          raise_error ~section "sessionStorage not available")
        (fun s -> s ## (getItem (state_key state_id))))
     (fun () -> raise Not_found)
     (fun s -> of_json ~typ:[%json: state] (Js.to_string s))

src/lib/eliom_client_core.client.ml

@@ -87,7 +87,7 @@ end = struct
           | None -> ""
           | Some p -> Printf.sprintf "(%s)" (Eliom_lib.pos_to_string p)
         in
-        raise_error_f ~section
+        raise_error ~section
           "Client closure %s not found %s (is the module linked on the client?)"
           closure_id pos
     in
@@ -136,7 +136,7 @@ end = struct
                   Printf.sprintf "%s (%s at %s)" name i
                     (Eliom_lib.pos_to_string pos)
             in
-            raise_error_f "Did not find injection %s" name))
+            raise_error "Did not find injection %s" name))
 
   let initialize ~compilation_unit_id
       {Eliom_runtime.injection_id; injection_value; _}
@@ -168,7 +168,7 @@ let do_next_server_section_data ~compilation_unit_id =
         data.server_section <- r;
         Array.iter Client_value.initialize l
     | [] ->
-        raise_error_f ~section
+        raise_error ~section
           "Queue of client value data for compilation unit %s is empty (is it linked on the server?)"
           compilation_unit_id
   with Not_found -> ()
@@ -184,7 +184,7 @@ let do_next_client_section_data ~compilation_unit_id =
         data.client_section <- r;
         Array.iter (fun i -> Injection.initialize ~compilation_unit_id i) l
     | [] ->
-        raise_error_f ~section
+        raise_error ~section
           "Queue of injection data for compilation unit %s is empty (is it linked on the server?)"
           compilation_unit_id
   with Not_found -> ()
@@ -732,7 +732,7 @@ let rebuild_node_ns ns context elt' =
     elt' context;
   if is_before_initial_load ()
   then
-    raise_error_f ~section ~inspect:(rebuild_node' ns elt')
+    raise_error ~section ~inspect:(rebuild_node' ns elt')
       "Cannot apply %s%s before the document is initially loaded" context
       Xml.(
         match get_node_id elt' with

src/lib/eliom_comet.client.ml

@@ -185,7 +185,7 @@ let handle_exn, set_handle_exn_function =
         "Unknown exception during comet. Customize this with Eliom_comet.set_handle_exn_function. "
       in
       match exn with
-      | Some exn -> raise_error ~section ~exn s
+      | Some exn -> raise_error ~section ~exn "%s" s
       | None -> Lwt_log.debug ~section s)
   in
   ( (fun ?exn () ->

src/lib/eliom_content_.client.ml

@@ -54,7 +54,7 @@ struct
         let elt' = Kind.toelt elt in
         match Xml.get_node_id elt' with
         | Xml.NoId ->
-            raise_error_f ~section:eliom_logs_src
+            raise_error ~section:eliom_logs_src
               ~inspect:
                 (Eliom_client_core.rebuild_node' Ns.content_ns (Kind.toelt elt))
               "Cannot call %s on an element with functional semantics" context
@@ -64,7 +64,7 @@ struct
     Js.Opt.case
       (Dom_html.CoerceTo.element (get_unique_node name elt))
       (fun () ->
-         raise_error_f ~section:eliom_logs_src
+         raise_error ~section:eliom_logs_src
            ~inspect:
              (Eliom_client_core.rebuild_node' Ns.content_ns (Kind.toelt elt))
            "Cannot call %s on a node which is not an element" name)

src/lib/eliom_lib.client.ml

@@ -81,13 +81,13 @@ end
 
 module Lwt_log = Lwt_log_js
 
-let raise_error ?inspect ?exn ?section ?location ?logger msg =
-  Lwt.ignore_result
-    (Lwt_log.log ?inspect ?exn ?section ?location ?logger ~level:Error msg);
-  match exn with Some exn -> raise exn | None -> failwith msg
-
-let raise_error_f ?inspect ?exn ?section ?location ?logger fmt =
-  Printf.ksprintf (raise_error ?inspect ?exn ?section ?location ?logger) fmt
+let raise_error ?inspect ?exn ?section ?location ?logger fmt =
+  let k msg =
+    Lwt.ignore_result
+      (Lwt_log.log ?inspect ?exn ?section ?location ?logger ~level:Error msg);
+    match exn with Some exn -> raise exn | None -> failwith msg
+  in
+  Printf.ksprintf k fmt
 
 let eliom_logs_src = Lwt_log.Section.make "eliom"
 

src/lib/eliom_lib.client.mli

@@ -82,15 +82,6 @@ val raise_error :
   -> ?section:Lwt_log.section
   -> ?location:string * int * int
   -> ?logger:Lwt_log.logger
-  -> string
-  -> 'a
-
-val raise_error_f :
-   ?inspect:'v
-  -> ?exn:exn
-  -> ?section:Lwt_log.section
-  -> ?location:string * int * int
-  -> ?logger:Lwt_log.logger
   -> ('a, unit, string, 'any) format4
   -> 'a