upgrade and unlock ocamlformat

Author: rr0gi

.ocamlformat

@@ -1,4 +1,4 @@
-version=0.13.0
+#version=0.19.0
 break-cases=toplevel
 break-infix-before-func=false
 break-infix=fit-or-vertical

lib/action.ml

@@ -22,7 +22,8 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) = struct
     |> List.filter ~f:(fun c ->
          let skip = Github.is_main_merge_message ~msg:c.message ~branch cfg in
          if skip then log#info "main branch merge, ignoring %s: %s" c.id (first_line c.message);
-         not skip)
+         not skip
+       )
     |> List.concat_map ~f:(fun commit ->
          let rules = List.filter ~f:(filter_by_branch ~distinct:commit.distinct) rules in
          let matched_channel_names =
@@ -33,7 +34,8 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) = struct
          let channel_names =
            if List.is_empty matched_channel_names && commit.distinct then default else matched_channel_names
          in
-         List.map channel_names ~f:(fun n -> n, commit))
+         List.map channel_names ~f:(fun n -> n, commit)
+       )
     |> Map.of_alist_multi (module String)
     |> Map.map ~f:(fun commits -> { n with commits })
     |> Map.to_alist
@@ -248,7 +250,8 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) = struct
             | Ok () -> Lwt.return_unit
             | Error msg ->
               log#warn "failed to save state file %s : %s" path msg;
-              Lwt.return_unit)
+              Lwt.return_unit
+          )
         in
         Lwt.return_some user_id
       | Error msg ->

lib/mrkdwn.ml

@@ -7,7 +7,8 @@ let escape_mrkdwn =
     | '<' -> "&lt;"
     | '>' -> "&gt;"
     | '&' -> "&amp;"
-    | c -> String.make 1 c)
+    | c -> String.make 1 c
+    )
 
 (** Translates omd AST to a Slack mrkdwn string. Code heavily adapted
     from omd 1.3.1 source.
@@ -111,7 +112,8 @@ let rec mrkdwn_of_md md =
         add_spaces list_indent;
         Buffer.add_string b "- ";
         loop ~is_in_list:true (list_indent + 4) li;
-        nl_if_needed_above b);
+        nl_if_needed_above b
+      );
       if list_indent = 0 then nl b;
       loop list_indent tl
     | Ol l ->
@@ -120,22 +122,25 @@ let rec mrkdwn_of_md md =
         add_spaces list_indent;
         Printf.bprintf b "%d. " (i + 1);
         loop ~is_in_list:true (list_indent + 4) li;
-        nl_if_needed_above b);
+        nl_if_needed_above b
+      );
       if list_indent = 0 then nl b;
       loop list_indent tl
     | Ulp l ->
       List.iter l ~f:(fun li ->
         nl_if_needed_above b;
         add_spaces list_indent;
         Buffer.add_string b "- ";
-        loop ~is_in_list:true (list_indent + 4) li (* Paragraphs => No need of '\n' *));
+        loop ~is_in_list:true (list_indent + 4) li (* Paragraphs => No need of '\n' *)
+      );
       loop list_indent tl
     | Olp l ->
       List.iteri l ~f:(fun i li ->
         nl_if_needed_above b;
         add_spaces list_indent;
         Printf.bprintf b "%d. " i;
-        loop ~is_in_list:true (list_indent + 4) li (* Paragraphs => No need of '\n' *));
+        loop ~is_in_list:true (list_indent + 4) li (* Paragraphs => No need of '\n' *)
+      );
       loop list_indent tl
     | Code_block (_lang, c) ->
       (* unlike commonmark, can't have code block inside lists, so print code block with

lib/rule.ml

@@ -89,7 +89,8 @@ module Prefix = struct
            | Some l, Some [] -> Stdio.printf "  %s" (show_match l)
            | Some l, Some i -> Stdio.printf "  %s and not %s" (show_match l) (show_match i)
          end;
-         Stdio.printf " -> #%s\n%!" rule.channel_name)
+         Stdio.printf " -> #%s\n%!" rule.channel_name
+       )
 end
 
 module Label = struct
@@ -124,5 +125,6 @@ module Label = struct
            | Some l, Some [] -> Stdio.printf "  %s" (show_match l)
            | Some l, Some i -> Stdio.printf "  %s and not %s" (show_match l) (show_match i)
          end;
-         Stdio.printf " -> #%s\n%!" rule.channel_name)
+         Stdio.printf " -> #%s\n%!" rule.channel_name
+       )
 end

lib/slack.ml

@@ -46,12 +46,14 @@ let generate_pull_request_notification notification channel =
     | _ ->
       invalid_arg
         (sprintf "Monorobot doesn't know how to generate notification for the unexpected event %s"
-           (string_of_pr_action action))
+           (string_of_pr_action action)
+        )
   in
   let summary =
     Some
       (sprintf "<%s|[%s]> Pull request #%d <%s|%s> %s by *%s*" repository.url repository.full_name number html_url title
-         action sender.login)
+         action sender.login
+      )
   in
   {
     channel;
@@ -86,12 +88,14 @@ let generate_pr_review_notification notification channel =
     | _ ->
       invalid_arg
         (sprintf "Monorobot doesn't know how to generate notification for the unexpected event %s"
-           (string_of_pr_review_action action))
+           (string_of_pr_review_action action)
+        )
   in
   let summary =
     Some
       (sprintf "<%s|[%s]> *%s* <%s|%s> #%d <%s|%s>" repository.url repository.full_name sender.login review.html_url
-         action_str number html_url title)
+         action_str number html_url title
+      )
   in
   {
     channel;
@@ -120,12 +124,14 @@ let generate_pr_review_comment_notification notification channel =
     | _ ->
       invalid_arg
         (sprintf "Monorobot doesn't know how to generate notification for the unexpected event %s"
-           (string_of_comment_action action))
+           (string_of_comment_action action)
+        )
   in
   let summary =
     Some
       (sprintf "<%s|[%s]> *%s* %s on #%d <%s|%s>" repository.url repository.full_name sender.login action_str number
-         html_url title)
+         html_url title
+      )
   in
   let file =
     match comment.path with
@@ -163,12 +169,14 @@ let generate_issue_notification notification channel =
     | _ ->
       invalid_arg
         (sprintf "Monorobot doesn't know how to generate notification for the unexpected event %s"
-           (string_of_issue_action action))
+           (string_of_issue_action action)
+        )
   in
   let summary =
     Some
       (sprintf "<%s|[%s]> Issue #%d <%s|%s> %s by *%s*" repository.url repository.full_name number html_url title action
-         sender.login)
+         sender.login
+      )
   in
   {
     channel;
@@ -198,12 +206,14 @@ let generate_issue_comment_notification notification channel =
       invalid_arg
         (sprintf
            "Monorobot doesn't know how to generate pull request review comment notification for the unexpected event %s"
-           (string_of_comment_action action))
+           (string_of_comment_action action)
+        )
   in
   let summary =
     Some
       (sprintf "<%s|[%s]> *%s* <%s|%s> on #%d <%s|%s>" repository.url repository.full_name sender.login comment.html_url
-         action_str number issue.html_url title)
+         action_str number issue.html_url title
+      )
   in
   {
     channel;
@@ -291,7 +301,8 @@ let generate_status_notification (cfg : Config_t.config) (notification : status_
     | _ ->
       invalid_arg
         (sprintf "Monorobot doesn't know how to generate notification for the unexpected event %s of %s"
-           (string_of_status_state state) sha)
+           (string_of_status_state state) sha
+        )
   in
   let color_info =
     match state with
@@ -327,7 +338,8 @@ let generate_status_notification (cfg : Config_t.config) (notification : status_
     | Some t ->
       Some
         (sprintf "<%s|[%s]> CI Build Status notification for <%s|%s>: %s" repository.url repository.full_name t context
-           state_info)
+           state_info
+        )
   in
   let msg = String.concat ~sep:"\n" @@ List.concat [ commit_info; branches_info ] in
   let attachment =
@@ -354,7 +366,8 @@ let generate_commit_comment_notification api_commit notification channel =
   let summary =
     Some
       (sprintf "<%s|[%s]> *%s* commented on `<%s|%s>` %s" repository.url repository.full_name sender.login
-         comment.html_url (git_short_sha_hash commit_id) (first_line commit.message))
+         comment.html_url (git_short_sha_hash commit_id) (first_line commit.message)
+      )
   in
   let path =
     match comment.path with

lib/slack_message.ml

@@ -62,7 +62,8 @@ let populate_pull_request repository (pull_request : pull_request) =
          merged;
          _;
        }
-        : pull_request)
+        : pull_request
+        )
     =
     pull_request
   in

monorobot.opam

@@ -25,7 +25,7 @@ depends: [
  "re"
  "stdio"
  "uri"
- "ocamlformat" {dev & = "0.13.0"}
+ "ocamlformat" {dev}
  "omd" {<= "1.3.1"}
  "yojson"
 ]

src/request_handler.ml

@@ -55,7 +55,8 @@ let setup_http ~ctx ~signature ~port ~ip =
           | Failure s -> s
           | Invalid_argument s -> s
           | exn -> Exn.str exn
-          ))
+          )
+    )
   in
   Lwt.return_unit
 

test/test.ml

@@ -17,7 +17,8 @@ let get_mock_payloads () =
   |> List.map ~f:(fun (kind, fn) ->
        let payload_path = Caml.Filename.concat mock_payload_dir fn in
        let state_path = Caml.Filename.concat mock_state_dir fn in
-       if Caml.Sys.file_exists state_path then kind, payload_path, Some state_path else kind, payload_path, None)
+       if Caml.Sys.file_exists state_path then kind, payload_path, Some state_path else kind, payload_path, None
+     )
 
 let process ~(ctx : Context.t) (kind, path, state_path) =
   let%lwt ctx =