From defe1e8983c8aeed8f71f679188e2a5604110860 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Tue, 20 Jun 2023 10:32:16 +0200 Subject: [PATCH] changes & dune build @fmt --- CHANGES.md | 2 +- lib/functoria/impl.ml | 4 ++-- test/mirage/job-no-device-behind-if/config.ml | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 94b26a2d3..d8b29b4ce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ - Adapt to docteur 0.0.6 release (#1419 @dinosaure) - Upgrade tests to cmdliner 1.2.0 (#1418 @hannesm) - Fail if jobs without arguments are registered (reported #873 @kit-ty-kate - #1426 @reynir @PizieDust, fixed #1428 @hannesm) + #1426 @reynir @PizieDust, fixed #1428 @hannesm and #1431 @reynir) - Console is marked as deprecated (#1429 @hannesm) - Tracing has been removed, since it was not used anymore and not supported with solo5-xen-pvh (#1430 @hannesm) diff --git a/lib/functoria/impl.ml b/lib/functoria/impl.ml index d6434590c..309624a44 100644 --- a/lib/functoria/impl.ml +++ b/lib/functoria/impl.ml @@ -46,8 +46,8 @@ let rec app_has_no_arguments = function | App { args = Cons _; _ } | Dev { args = Cons _; _ } -> false | App _ | Dev _ -> true | If { cond = _; branches; default } -> - app_has_no_arguments default || - List.exists (fun (_, branch) -> app_has_no_arguments branch) branches + app_has_no_arguments default + || List.exists (fun (_, branch) -> app_has_no_arguments branch) branches (* Devices *) diff --git a/test/mirage/job-no-device-behind-if/config.ml b/test/mirage/job-no-device-behind-if/config.ml index 455d6667e..c3954fffc 100644 --- a/test/mirage/job-no-device-behind-if/config.ml +++ b/test/mirage/job-no-device-behind-if/config.ml @@ -6,4 +6,8 @@ let key = let doc = Key.Arg.info ~doc:"How to say hello." [ "hello" ] in Key.(create "hello" Arg.(opt string "Hello World!" doc)) -let () = register ~keys:[ Key.v key ] ~src:`None "noop" [ if_impl Key.is_solo5 main main ] +let () = + register + ~keys:[ Key.v key ] + ~src:`None "noop" + [ if_impl Key.is_solo5 main main ]