Merge pull request #666 from ocsigen/format

Upgrading ocamlformat version (both os and template)

Author: vouillon

.ocamlformat

@@ -1,4 +1,4 @@
-version=0.19.0
+version=0.26.1
 break-cases = fit
 break-collection-expressions = fit-or-vertical
 break-fun-decl = wrap

src/os_comet.eliom

@@ -20,6 +20,7 @@
 
 open%client Js_of_ocaml
 open%client Js_of_ocaml_lwt
+
 let%shared __link = () (* to make sure os_comet is linked *)
 
 let%client cookies_enabled () =
@@ -49,7 +50,7 @@ let%client restart_process () =
 
 let%client _ =
   Eliom_comet.set_handle_exn_function (fun ?exn:_ () ->
-      restart_process (); Lwt.return_unit)
+    restart_process (); Lwt.return_unit)
 
 (* We create a channel on scope user_indep_process_scope,
    to monitor the application.
@@ -74,7 +75,7 @@ let create_monitor_channel () =
    (so that it is not garbage collected).
    It is garbage collected when this client process state is closed
    after timeout.
- *)
+*)
 let monitor_channel_ref =
   Eliom_reference.Volatile.eref ~scope:Os_session.user_indep_process_scope None
 
@@ -83,10 +84,9 @@ let already_send_ref =
 
 let%client handle_error =
   ref (fun exn ->
-      Eliom_lib.debug_exn "Exception received on Os_comet's monitor channel: "
-        exn;
-      restart_process ();
-      Lwt.return_unit)
+    Eliom_lib.debug_exn "Exception received on Os_comet's monitor channel: " exn;
+    restart_process ();
+    Lwt.return_unit)
 
 let%client set_error_handler f = handle_error := f
 
@@ -109,15 +109,15 @@ let%server _ =
 
 let%server _ =
   Os_session.on_start_process (fun _ ->
-      let channel = create_monitor_channel () in
-      Eliom_reference.Volatile.set monitor_channel_ref (Some channel);
-      ignore
-        [%client
-          (Lwt.async (fun () ->
-               Lwt_stream.iter_s handle_message
-                 (Lwt_stream.wrap_exn ~%(fst channel)))
-            : unit)];
-      Lwt.return_unit);
+    let channel = create_monitor_channel () in
+    Eliom_reference.Volatile.set monitor_channel_ref (Some channel);
+    ignore
+      [%client
+        (Lwt.async (fun () ->
+           Lwt_stream.iter_s handle_message
+             (Lwt_stream.wrap_exn ~%(fst channel)))
+         : unit)];
+    Lwt.return_unit);
   let warn c =
     (* User connected or disconnected.
        I want to send the message on all tabs of the browser: *)
@@ -129,9 +129,9 @@ let%server _ =
         ~state:
           (Eliom_state.Ext.current_volatile_data_state
              ~scope:Os_session.user_indep_session_scope ()) (fun state ->
-          match Eliom_reference.Volatile.Ext.get state monitor_channel_ref with
-          | Some (_, send) as v -> if not (v == cur) then send c
-          | None -> ()));
+        match Eliom_reference.Volatile.Ext.get state monitor_channel_ref with
+        | Some (_, send) as v -> if not (v == cur) then send c
+        | None -> ()));
     Lwt.return_unit
   in
   let warn_connection_change _ = warn Connection_changed in

src/os_connect_phone.eliom

@@ -112,8 +112,7 @@ let%server confirm_code_signup_no_connect ~first_name ~last_name ~code ~password
   | _ -> Lwt.return_none
 
 let%rpc confirm_code_signup ~(first_name : string) ~(last_name : string)
-    ~(code : string) ~(password : string) ()
-    : bool Lwt.t
+    ~(code : string) ~(password : string) () : bool Lwt.t
   =
   match%lwt
     confirm_code_signup_no_connect ~first_name ~last_name ~code ~password ()

src/os_connect_phone.eliomi

@@ -25,15 +25,15 @@ type sms_error_core = [`Unknown | `Send | `Limit | `Invalid_number]
 
 [%%server.start]
 
-val set_send_sms_handler
-  :  (number:string -> string -> (unit, sms_error_core) result Lwt.t)
+val set_send_sms_handler :
+   (number:string -> string -> (unit, sms_error_core) result Lwt.t)
   -> unit
 (** [set_send_sms_handler f] registers [f] as the function to be
     called to send SMS messages. Used to send activation codes for
     connectivity by mail. *)
 
-val confirm_code_signup_no_connect
-  :  first_name:string
+val confirm_code_signup_no_connect :
+   first_name:string
   -> last_name:string
   -> code:string
   -> password:string
@@ -60,8 +60,8 @@ val confirm_code_extra : string -> bool Lwt.t
 (** Confirm validation code and add extra phone to account of the currently
     connected user*)
 
-val confirm_code_signup
-  :  first_name:string
+val confirm_code_signup :
+   first_name:string
   -> last_name:string
   -> code:string
   -> password:string
@@ -74,8 +74,8 @@ val confirm_code_recovery : string -> bool Lwt.t
 (** Confirm validation code and recover account. We redirect to the
     settings page for setting a new password. *)
 
-val connect
-  :  keepmeloggedin:bool
+val connect :
+   keepmeloggedin:bool
   -> password:string
   -> string
   -> [`Login_ok | `No_such_user | `Wrong_password | `Password_not_set] Lwt.t

src/os_current_user.eliom

@@ -101,18 +101,18 @@ let%server unset_user_client () =
 
 let%server () =
   Os_session.on_request (fun myid_o ->
-      match myid_o with
-      | Some myid -> set_user_server myid
-      | None -> unset_user_server (); Lwt.return_unit);
+    match myid_o with
+    | Some myid -> set_user_server myid
+    | None -> unset_user_server (); Lwt.return_unit);
   Os_session.on_start_connected_process (fun myid ->
-      let%lwt () = set_user_server myid in
-      set_user_client (); Lwt.return_unit);
+    let%lwt () = set_user_server myid in
+    set_user_client (); Lwt.return_unit);
   Os_session.on_pre_close_session (fun () ->
-      unset_user_client ();
-      (*VVV!!! will affect only current tab!! *)
-      unset_user_server ();
-      (* ok this is a request reference *)
-      Lwt.return_unit)
+    unset_user_client ();
+    (*VVV!!! will affect only current tab!! *)
+    unset_user_server ();
+    (* ok this is a request reference *)
+    Lwt.return_unit)
 
 let%rpc remove_email_from_user (email : string) : unit Lwt.t =
   let myid = get_current_userid () in

src/os_date.eliom

@@ -64,7 +64,6 @@ let user_tz_opt () =
   else tz
 
 let user_tz () = match user_tz_opt () with None -> "UTC" | Some v -> v
-
 let%client user_tz () = timezone
 
 (* This function is called once by each client process to record on server
@@ -84,7 +83,7 @@ let%client disable_auto_init () = auto_init := false
 let%client _ =
   (* We wait for the client process to be fully loaded: *)
   Eliom_client.onload (fun () ->
-      if !auto_init then Lwt.async (fun () -> init_time_rpc timezone))
+    if !auto_init then Lwt.async (fun () -> init_time_rpc timezone))
 
 [%%shared
 open CalendarLib
@@ -152,8 +151,8 @@ let%client to_utc d =
   let o' = (new%js Js.date_fromTimeValue (d' *. 1000.))##getTimezoneOffset in
   CalendarLib.Calendar.from_unixfloat
     (if o = o'
-    then d' (* We guessed the DST status right *)
-    else d +. (float o' *. 60.))
+     then d' (* We guessed the DST status right *)
+     else d +. (float o' *. 60.))
 (* Assume other DST status *)
 
 let%server now ?timezone () = to_local ?timezone (CalendarLib.Calendar.now ())

src/os_date.eliomi

@@ -118,8 +118,8 @@ val smart_hours_minutes : local_calendar -> string
     If the timezone is unknown, GMT is added.
  *)
 
-val smart_interval
-  :  ?now:local_calendar
+val smart_interval :
+   ?now:local_calendar
   -> local_calendar
   -> local_calendar
   -> string
@@ -138,8 +138,8 @@ val smart_interval
     year is needed and ["%B %d"] if not.
  *)
 
-val smart_date_interval
-  :  ?now:local_calendar
+val smart_date_interval :
+   ?now:local_calendar
   -> local_calendar
   -> local_calendar
   -> string

src/os_email.eliomi

@@ -45,8 +45,8 @@ val is_valid : string -> bool
 (** [is_valid email] returns [true] if the e-mail address [email] is valid. Else
     it returns [false]. *)
 
-val send
-  :  ?url:string
+val send :
+   ?url:string
   -> ?from_addr:string * string
   -> to_addrs:(string * string) list
   -> subject:string
@@ -58,13 +58,13 @@ val send
     Tuples used by [from_addr] and [to_addrs] is of the form [(name, email)].
     *)
 
-val set_send
-  :  (?url:string
-      -> from_addr:string * string
-      -> to_addrs:(string * string) list
-      -> subject:string
-      -> string list
-      -> unit Lwt.t)
+val set_send :
+   (?url:string
+    -> from_addr:string * string
+    -> to_addrs:(string * string) list
+    -> subject:string
+    -> string list
+    -> unit Lwt.t)
   -> unit
 (** Customize email sending function. See {!send} for more details about the
     arguments.

src/os_fcm_notif.eliom

@@ -193,7 +193,7 @@ module Response = struct
   module Results = struct
     (* If an error occurred, one of these sum types is returned (based on the
            couple (code, error_as_string), see [error_of_string_and_code].
-         *)
+    *)
     type error =
       | Missing_registration
       | Invalid_registration
@@ -214,7 +214,7 @@ module Response = struct
     (* Internal use. See
            https://developers.google.com/cloud-messaging/http-server-ref
            table 9
-         *)
+    *)
     let error_of_string_and_code = function
       | 200, "MissingRegistration" -> Missing_registration
       | 200, "InvalidRegistration" -> Invalid_registration
@@ -253,7 +253,7 @@ module Response = struct
 
     (* If no error occurred, the JSON in the results attribute contains a
            mandatory field message_id and an optional field registration_id.
-         *)
+    *)
     type success = {message_id : string; registration_id : string option}
 
     let message_id_of_success success = success.message_id
@@ -266,7 +266,7 @@ module Response = struct
       match Util.member "message_id" json with
       (* If the field [message_id] is present, we are in the case of a
                successful message
-             *)
+      *)
       | `String x ->
           let message_id = x in
           let registration_id =
@@ -279,12 +279,12 @@ module Response = struct
                case of an error message.
                The pattern _ is used because is equivalent to `Null in this
                case due to the predefined type of the message_id (string).
-             *)
+      *)
       | _ -> (
         match Util.member "error" json with
         (* If the field [error] is present, we are in the case of an
                  error message.
-               *)
+        *)
         | `String err -> Error (error_of_string_and_code (code, err))
         (* Else we don't know what is the result. *)
         | _ -> raise (FCM_missing_field "No message_id and error fields found.")
@@ -307,7 +307,7 @@ module Response = struct
            the max integer. The first pattern is `Int x is x is smaller
            than the max integer and the second is `String if x can't be
            interpreted as an integer.
-         *)
+    *)
     let multicast_id =
       match Util.member "multicast_id" json with
       | `Int x -> string_of_int x
@@ -331,7 +331,7 @@ module Response = struct
     in
     (* As results is an options array, we don't fail if it's not present but
            we use an empty list.
-         *)
+    *)
     let results =
       match Util.member "results" json with
       | `List l -> List.map (Results.t_of_json code) l
@@ -342,7 +342,7 @@ module Response = struct
   (* Build a type t from the raw HTTP response. The HTTP response code is
          computed to pass it to [t_of_json] and to [results_of_json] to be used
          if an error occurred.
-       *)
+  *)
   let t_of_http_response (r, b) =
     try%lwt
       let status = Cohttp.(Code.code_of_status (Response.status r)) in
@@ -352,7 +352,7 @@ module Response = struct
     with
     (* Could be the case if the server key is wrong or if it's not
            registered only in FCM and not in FCM (since September 2016).
-         *)
+    *)
     | Yojson.Json_error _ ->
       Lwt.fail (FCM_no_json_response "It could come from your server key.")
 

src/os_fcm_notif.eliomi

@@ -448,8 +448,8 @@ module Response : sig
   (** [results_of_t response] returns the status of the messages processed. *)
 end
 
-val send
-  :  string
+val send :
+   string
   -> Notification.t
   -> ?data:Data.t
   -> Options.t