Skip to content

Commit 8fc7e43

Browse files
committed
Apply OCamlFormat 0.27.0
1 parent beceaa5 commit 8fc7e43

File tree

12 files changed

+42
-38
lines changed

12 files changed

+42
-38
lines changed

.ocamlformat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 0.25.1
1+
version = 0.27.0
22
ocaml-version = 4.14
33
profile = conventional
44
break-infix = fit-or-vertical

api/client.ml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,13 +331,13 @@ module Commit = struct
331331
let open Raw.Client.Commit.Status in
332332
let request = Capability.Request.create_no_args () in
333333
Capability.call_for_value t method_id request
334-
>>= (Results.status_get >> function
335-
| NotStarted -> Ok `Not_started
336-
| Passed -> Ok `Passed
337-
| Failed -> Ok `Failed
338-
| Pending -> Ok `Pending
339-
| Undefined i ->
340-
Error (`Msg (Fmt.str "client.states: undefined state %d" i)))
334+
>>= ( Results.status_get >> function
335+
| NotStarted -> Ok `Not_started
336+
| Passed -> Ok `Passed
337+
| Failed -> Ok `Failed
338+
| Pending -> Ok `Pending
339+
| Undefined i ->
340+
Error (`Msg (Fmt.str "client.states: undefined state %d" i)) )
341341

342342
let message t =
343343
let open Raw.Client.Commit.Message in

api/client.mli

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,15 @@ module Repo : sig
9393
(** [commit_of_hash t hash] is the commit [hash] in this repository. *)
9494

9595
val commit_of_ref : t -> git_ref -> Commit.t
96-
(** [commit_of_ref t gref] is the commit at the head of Git reference [gref]. *)
96+
(** [commit_of_ref t gref] is the commit at the head of Git reference [gref].
97+
*)
9798

9899
val history_of_ref :
99100
t ->
100101
git_ref ->
101102
(ref_info list, [> `Capnp of Capnp_rpc.Error.t ]) Lwt_result.t
102-
(** [history_of_ref t gref] is the list of builds for the Git reference [gref] *)
103+
(** [history_of_ref t gref] is the list of builds for the Git reference [gref]
104+
*)
103105
end
104106

105107
module Org : sig

client/main.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ let gref =
177177
if String.length s < 6 then
178178
Error
179179
(`Msg
180-
"Git reference should start 'refs/' or be a hash at least 6 \
181-
characters long")
180+
"Git reference should start 'refs/' or be a hash at least 6 \
181+
characters long")
182182
else Ok (`Commit s)
183183
else if String.is_prefix ~affix:"refs/" s then make_ref s
184184
else make_ref ("refs/" ^ s)

lib/analyse_ocamlformat.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ let ocamlformat_version_from_file ~root job path =
6868
Lwt.return
6969
(Error
7070
(`Msg
71-
"Missing 'version=' line in .ocamlformat (disabled, but \
72-
some .ocamlformat-enable files are present)")))
71+
"Missing 'version=' line in .ocamlformat (disabled, but \
72+
some .ocamlformat-enable files are present)")))
7373
| _ :: _ :: _ ->
7474
Lwt.return (Error (`Msg "Multiple 'version=' lines in .ocamlformat"))
7575

lib/analyse_ocamlformat.mli

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ val ocamlformat_version_from_file :
1515
Current.Job.t ->
1616
string ->
1717
(string option, [ `Msg of string ]) Lwt_result.t
18-
(** Extract the version in .ocamlformat file if the file exists in the project *)
18+
(** Extract the version in .ocamlformat file if the file exists in the project
19+
*)
1920

2021
val get_ocamlformat_source :
2122
opam_files:string list ->

lib/index.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ val set_active_owners : Owner_set.t -> unit
3030

3131
val get_active_owners : unit -> Owner_set.t
3232
(** [get_active_owners ()] is the last value passed to [set_active_owners], or
33-
[\[\]] if not known yet. *)
33+
[[]] if not known yet. *)
3434

3535
val set_active_repos : owner:string -> Repo_set.t -> unit
3636
(** [set_active_repos ~owner repos] records that [repos] is the set of active

lib/pipeline.ml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ let list_errors ~ok errs =
1212
in
1313
Error
1414
(`Msg
15-
(match groups with
16-
| [] -> "No builds at all!"
17-
| [ (msg, _) ] when ok = 0 ->
18-
msg (* Everything failed with the same error *)
19-
| [ (msg, ls) ] ->
20-
Fmt.str "%a failed: %s" Fmt.(list ~sep:(any ", ") string) ls msg
21-
| _ ->
22-
(* Multiple error messages; just list everything that failed. *)
23-
let pp_label f (_, l) = Fmt.string f l.Build_info.label in
24-
Fmt.str "%a failed" Fmt.(list ~sep:(any ", ") pp_label) errs))
15+
(match groups with
16+
| [] -> "No builds at all!"
17+
| [ (msg, _) ] when ok = 0 ->
18+
msg (* Everything failed with the same error *)
19+
| [ (msg, ls) ] ->
20+
Fmt.str "%a failed: %s" Fmt.(list ~sep:(any ", ") string) ls msg
21+
| _ ->
22+
(* Multiple error messages; just list everything that failed. *)
23+
let pp_label f (_, l) = Fmt.string f l.Build_info.label in
24+
Fmt.str "%a failed" Fmt.(list ~sep:(any ", ") pp_label) errs))
2525

2626
let summarise results =
2727
results

lib/platform.mli

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ val get :
5353
string Current.t ->
5454
t list Current.t
5555
(** [get ~label ~builder ~variant ~host_base base] creates a [t] by getting the
56-
opam variables from [host_base] and returning [base] for subsequent builds. *)
56+
opam variables from [host_base] and returning [base] for subsequent builds.
57+
*)
5758

5859
val get_local :
5960
arch:Ocaml_version.arch ->
@@ -68,7 +69,8 @@ val get_local :
6869
Current_docker.Raw.Image.t Current.t ->
6970
t list Current.t
7071
(** [get ~label ~builder ~variant ~host_base base] creates a [t] by getting the
71-
opam variables from [host_base] and returning [base] for subsequent builds. *)
72+
opam variables from [host_base] and returning [base] for subsequent builds.
73+
*)
7274

7375
val pull :
7476
arch:Ocaml_version.arch ->

service/api_impl.ml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ let make_commit ~engine ~owner ~name hash =
9393
let open Commit.Status in
9494
release_param_caps ();
9595
let response, results = Service.Response.create Results.init_pointer in
96-
(Index.Commit_cache.(find ~owner ~name ~hash |> get_status) |> function
97-
| `Not_started -> Results.status_set results NotStarted
98-
| `Pending -> Results.status_set results Pending
99-
| `Failed -> Results.status_set results Failed
100-
| `Passed -> Results.status_set results Passed);
96+
( Index.Commit_cache.(find ~owner ~name ~hash |> get_status) |> function
97+
| `Not_started -> Results.status_set results NotStarted
98+
| `Pending -> Results.status_set results Pending
99+
| `Failed -> Results.status_set results Failed
100+
| `Passed -> Results.status_set results Passed );
101101
Service.return response
102102

103103
method message_impl _params release_param_caps =

0 commit comments

Comments
 (0)