From b6d2192baca3ac91b4cc1c925562cde39fea2e8f Mon Sep 17 00:00:00 2001 From: Etienne Millon Date: Wed, 18 Dec 2019 16:22:02 +0100 Subject: [PATCH] Use long-form target inference --- dune | 8 +- test/cli/dune | 18 +- test/failing/dune | 6 +- test/passing/dune | 3 +- test/passing/dune.inc | 666 ++++++++++++++-------------------------- test/passing/gen/gen.ml | 10 +- test/projects/dune | 12 +- 7 files changed, 242 insertions(+), 481 deletions(-) diff --git a/dune b/dune index 725c42b609..f34850376c 100644 --- a/dune +++ b/dune @@ -15,11 +15,9 @@ (:standard -noassert)))) (rule - (targets ocamlformat-help.actual) - (action - (with-stdout-to - %{targets} - (run ocamlformat --help=plain)))) + (with-stdout-to + ocamlformat-help.actual + (run ocamlformat --help=plain))) (rule (alias runtest) diff --git a/test/cli/dune b/test/cli/dune index c03e3e8e2f..14b0e6daa9 100644 --- a/test/cli/dune +++ b/test/cli/dune @@ -402,7 +402,6 @@ (diff max_iter_1_failing.expected max_iter_1_failing.output))) (rule - (targets conf_bad_version.output) (deps (source_tree roots/bad_version)) (action @@ -411,7 +410,7 @@ ;; (it contains the current git rev) %{null} (with-stdout-to - %{targets} + conf_bad_version.output (with-stdin-from sample/a.ml (chdir @@ -426,12 +425,11 @@ (diff conf_bad_version.expected conf_bad_version.output))) (rule - (targets conf_malformed1.output) (deps (source_tree roots/malformed1)) (action (with-outputs-to - %{targets} + conf_malformed1.output (with-stdin-from sample/a.ml (chdir @@ -446,12 +444,11 @@ (diff conf_malformed1.expected conf_malformed1.output))) (rule - (targets conf_unknown_option.output) (deps (source_tree roots/unknown_option)) (action (with-outputs-to - %{targets} + conf_unknown_option.output (with-stdin-from sample/a.ml (chdir @@ -466,12 +463,11 @@ (diff conf_unknown_option.expected conf_unknown_option.output))) (rule - (targets conf_unknown_value.output) (deps (source_tree roots/unknown_value)) (action (with-outputs-to - %{targets} + conf_unknown_value.output (with-stdin-from sample/a.ml (chdir @@ -486,12 +482,11 @@ (diff conf_unknown_value.expected conf_unknown_value.output))) (rule - (targets env_unknown_option.output) (deps (source_tree roots/unknown_value)) (action (with-outputs-to - %{targets} + env_unknown_option.output (with-stdin-from sample/a.ml (setenv @@ -507,12 +502,11 @@ (diff env_unknown_option.expected env_unknown_option.output))) (rule - (targets env_unknown_value.output) (deps (source_tree roots/unknown_value)) (action (with-outputs-to - %{targets} + env_unknown_value.output (setenv OCAMLFORMAT "type-decl=unknown" diff --git a/test/failing/dune b/test/failing/dune index e05b52e691..307a9395aa 100644 --- a/test/failing/dune +++ b/test/failing/dune @@ -1,10 +1,8 @@ (rule - (targets list_and_comments.ml.output) (deps .ocamlformat) (action - (with-outputs-to - %{targets} - (run %{bin:ocamlformat} %{dep:list_and_comments.ml})))) + (with-outputs-to list_and_comments.ml.output + (run %{bin:ocamlformat} %{dep:list_and_comments.ml})))) (rule (alias runtest) diff --git a/test/passing/dune b/test/passing/dune index a198841188..856f6be7db 100644 --- a/test/passing/dune +++ b/test/passing/dune @@ -1,12 +1,11 @@ (include dune.inc) (rule - (targets dune.inc.gen) (deps (source_tree .)) (action (with-stdout-to - %{targets} + dune.inc.gen (run ./gen/gen.exe)))) (rule diff --git a/test/passing/dune.inc b/test/passing/dune.inc index 093adf06e6..fb561546b3 100644 --- a/test/passing/dune.inc +++ b/test/passing/dune.inc @@ -1,9 +1,8 @@ (rule - (targets align_cases-break_all.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to align_cases-break_all.ml.output (run %{bin:ocamlformat} --align-constructors-decl --align-variants-decl --align-cases --break-cases=all %{dep:align_cases.ml})))) (rule @@ -11,10 +10,9 @@ (action (diff align_cases-break_all.ml.ref align_cases-break_all.ml.output))) (rule - (targets align_cases.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to align_cases.ml.output (run %{bin:ocamlformat} --align-constructors-decl --align-variants-decl --align-cases %{dep:align_cases.ml})))) (rule @@ -22,10 +20,9 @@ (action (diff align_cases.ml align_cases.ml.output))) (rule - (targets align_infix.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to align_infix.ml.output (run %{bin:ocamlformat} --break-infix=fit-or-vertical %{dep:align_infix.ml})))) (rule @@ -33,10 +30,9 @@ (action (diff align_infix.ml align_infix.ml.output))) (rule - (targets apply.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to apply.ml.output (run %{bin:ocamlformat} %{dep:apply.ml})))) (rule @@ -44,10 +40,9 @@ (action (diff apply.ml apply.ml.output))) (rule - (targets array.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to array.ml.output (run %{bin:ocamlformat} %{dep:array.ml})))) (rule @@ -55,10 +50,9 @@ (action (diff array.ml array.ml.output))) (rule - (targets assignment_operator-op_begin_line.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to assignment_operator-op_begin_line.ml.output (run %{bin:ocamlformat} --assignment-operator=begin-line %{dep:assignment_operator.ml})))) (rule @@ -66,10 +60,9 @@ (action (diff assignment_operator-op_begin_line.ml.ref assignment_operator-op_begin_line.ml.output))) (rule - (targets assignment_operator.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to assignment_operator.ml.output (run %{bin:ocamlformat} %{dep:assignment_operator.ml})))) (rule @@ -77,10 +70,9 @@ (action (diff assignment_operator.ml.ref assignment_operator.ml.output))) (rule - (targets attribute_and_expression.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to attribute_and_expression.ml.output (run %{bin:ocamlformat} %{dep:attribute_and_expression.ml})))) (rule @@ -88,10 +80,9 @@ (action (diff attribute_and_expression.ml attribute_and_expression.ml.output))) (rule - (targets attributes.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to attributes.ml.output (run %{bin:ocamlformat} %{dep:attributes.ml})))) (rule @@ -100,10 +91,9 @@ (action (diff attributes.ml attributes.ml.output))) (rule - (targets attributes.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to attributes.mli.output (run %{bin:ocamlformat} %{dep:attributes.mli})))) (rule @@ -111,10 +101,9 @@ (action (diff attributes.mli.ref attributes.mli.output))) (rule - (targets break_before_in-auto.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_before_in-auto.ml.output (run %{bin:ocamlformat} --break-before-in=auto %{dep:break_before_in.ml})))) (rule @@ -122,10 +111,9 @@ (action (diff break_before_in-auto.ml.ref break_before_in-auto.ml.output))) (rule - (targets break_before_in.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_before_in.ml.output (run %{bin:ocamlformat} --break-before-in=fit-or-vertical %{dep:break_before_in.ml})))) (rule @@ -133,10 +121,9 @@ (action (diff break_before_in.ml break_before_in.ml.output))) (rule - (targets break_cases-align.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-align.ml.output (run %{bin:ocamlformat} --nested-match=align --break-cases=all %{dep:break_cases.ml})))) (rule @@ -144,10 +131,9 @@ (action (diff break_cases-align.ml.ref break_cases-align.ml.output))) (rule - (targets break_cases-all.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-all.ml.output (run %{bin:ocamlformat} --break-cases=all %{dep:break_cases.ml})))) (rule @@ -155,10 +141,9 @@ (action (diff break_cases-all.ml.ref break_cases-all.ml.output))) (rule - (targets break_cases-closing_on_separate_line.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-closing_on_separate_line.ml.output (run %{bin:ocamlformat} --break-cases=all --indicate-multiline-delimiters=closing-on-separate-line %{dep:break_cases.ml})))) (rule @@ -166,10 +151,9 @@ (action (diff break_cases-closing_on_separate_line.ml.ref break_cases-closing_on_separate_line.ml.output))) (rule - (targets break_cases-closing_on_separate_line_leading_nested_match_parens.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-closing_on_separate_line_leading_nested_match_parens.ml.output (run %{bin:ocamlformat} --break-cases=all --indicate-multiline-delimiters=closing-on-separate-line --leading-nested-match-parens %{dep:break_cases.ml})))) (rule @@ -177,10 +161,9 @@ (action (diff break_cases-closing_on_separate_line_leading_nested_match_parens.ml.ref break_cases-closing_on_separate_line_leading_nested_match_parens.ml.output))) (rule - (targets break_cases-cosl_lnmp_cmei.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-cosl_lnmp_cmei.ml.output (run %{bin:ocamlformat} --break-cases=all --indicate-multiline-delimiters=closing-on-separate-line --leading-nested-match-parens --cases-matching-exp-indent=normal %{dep:break_cases.ml})))) (rule @@ -188,10 +171,9 @@ (action (diff break_cases-cosl_lnmp_cmei.ml.ref break_cases-cosl_lnmp_cmei.ml.output))) (rule - (targets break_cases-fit_or_vertical.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-fit_or_vertical.ml.output (run %{bin:ocamlformat} --break-cases=fit-or-vertical %{dep:break_cases.ml})))) (rule @@ -199,10 +181,9 @@ (action (diff break_cases-fit_or_vertical.ml.ref break_cases-fit_or_vertical.ml.output))) (rule - (targets break_cases-nested.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-nested.ml.output (run %{bin:ocamlformat} --break-cases=nested %{dep:break_cases.ml})))) (rule @@ -210,10 +191,9 @@ (action (diff break_cases-nested.ml.ref break_cases-nested.ml.output))) (rule - (targets break_cases-normal_indent.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-normal_indent.ml.output (run %{bin:ocamlformat} --cases-matching-exp-indent=normal --break-cases=all %{dep:break_cases.ml})))) (rule @@ -221,10 +201,9 @@ (action (diff break_cases-normal_indent.ml.ref break_cases-normal_indent.ml.output))) (rule - (targets break_cases-toplevel.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases-toplevel.ml.output (run %{bin:ocamlformat} --break-cases=toplevel --max-iter=4 %{dep:break_cases.ml})))) (rule @@ -232,10 +211,9 @@ (action (diff break_cases-toplevel.ml.ref break_cases-toplevel.ml.output))) (rule - (targets break_cases.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_cases.ml.output (run %{bin:ocamlformat} --break-cases=fit --max-iter=4 %{dep:break_cases.ml})))) (rule @@ -243,10 +221,9 @@ (action (diff break_cases.ml.ref break_cases.ml.output))) (rule - (targets break_fun_decl-fit_or_vertical.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_fun_decl-fit_or_vertical.ml.output (run %{bin:ocamlformat} --break-fun-decl=fit-or-vertical --break-fun-sig=fit-or-vertical %{dep:break_fun_decl.ml})))) (rule @@ -254,10 +231,9 @@ (action (diff break_fun_decl-fit_or_vertical.ml.ref break_fun_decl-fit_or_vertical.ml.output))) (rule - (targets break_fun_decl-smart.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_fun_decl-smart.ml.output (run %{bin:ocamlformat} --break-fun-decl=smart --break-fun-sig=smart %{dep:break_fun_decl.ml})))) (rule @@ -265,10 +241,9 @@ (action (diff break_fun_decl-smart.ml.ref break_fun_decl-smart.ml.output))) (rule - (targets break_fun_decl-wrap.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_fun_decl-wrap.ml.output (run %{bin:ocamlformat} --break-fun-decl=wrap --break-fun-sig=wrap %{dep:break_fun_decl.ml})))) (rule @@ -276,10 +251,9 @@ (action (diff break_fun_decl-wrap.ml.ref break_fun_decl-wrap.ml.output))) (rule - (targets break_fun_decl.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_fun_decl.ml.output (run %{bin:ocamlformat} %{dep:break_fun_decl.ml})))) (rule @@ -287,10 +261,9 @@ (action (diff break_fun_decl.ml break_fun_decl.ml.output))) (rule - (targets break_record.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_record.ml.output (run %{bin:ocamlformat} --profile=janestreet --margin=58 %{dep:break_record.ml})))) (rule @@ -298,10 +271,9 @@ (action (diff break_record.ml break_record.ml.output))) (rule - (targets break_separators-after.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators-after.ml.output (run %{bin:ocamlformat} --break-separators=after --max-iter=3 %{dep:break_separators.ml})))) (rule @@ -309,10 +281,9 @@ (action (diff break_separators-after.ml.ref break_separators-after.ml.output))) (rule - (targets break_separators-after_docked.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators-after_docked.ml.output (run %{bin:ocamlformat} --break-separators=after --dock-collection-brackets --max-iter=3 %{dep:break_separators.ml})))) (rule @@ -320,10 +291,9 @@ (action (diff break_separators-after_docked.ml.ref break_separators-after_docked.ml.output))) (rule - (targets break_separators-after_docked_transition_message.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators-after_docked_transition_message.ml.output (with-accepted-exit-codes 1 (run %{bin:ocamlformat} --break-separators=after-and-docked %{dep:break_separators.ml}))))) @@ -332,10 +302,9 @@ (action (diff break_separators-after_docked_transition_message.ml.ref break_separators-after_docked_transition_message.ml.output))) (rule - (targets break_separators-after_docked_wrap.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators-after_docked_wrap.ml.output (run %{bin:ocamlformat} --break-separators=after --break-collection-expressions=wrap --dock-collection-brackets %{dep:break_separators.ml})))) (rule @@ -343,10 +312,9 @@ (action (diff break_separators-after_docked_wrap.ml.ref break_separators-after_docked_wrap.ml.output))) (rule - (targets break_separators-after_wrap.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators-after_wrap.ml.output (run %{bin:ocamlformat} --break-separators=after --break-collection-expressions=wrap %{dep:break_separators.ml})))) (rule @@ -354,10 +322,9 @@ (action (diff break_separators-after_wrap.ml.ref break_separators-after_wrap.ml.output))) (rule - (targets break_separators-before_docked.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators-before_docked.ml.output (run %{bin:ocamlformat} --break-separators=before --dock-collection-brackets --max-iter=3 %{dep:break_separators.ml})))) (rule @@ -365,10 +332,9 @@ (action (diff break_separators-before_docked.ml.ref break_separators-before_docked.ml.output))) (rule - (targets break_separators-before_docked_wrap.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators-before_docked_wrap.ml.output (run %{bin:ocamlformat} --break-separators=before --break-collection-expressions=wrap --dock-collection-brackets %{dep:break_separators.ml})))) (rule @@ -376,10 +342,9 @@ (action (diff break_separators-before_docked_wrap.ml.ref break_separators-before_docked_wrap.ml.output))) (rule - (targets break_separators-wrap.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators-wrap.ml.output (run %{bin:ocamlformat} --break-separators=before --break-collection-expressions=wrap %{dep:break_separators.ml})))) (rule @@ -387,10 +352,9 @@ (action (diff break_separators-wrap.ml.ref break_separators-wrap.ml.output))) (rule - (targets break_separators.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_separators.ml.output (run %{bin:ocamlformat} --break-separators=before --max-iter=3 %{dep:break_separators.ml})))) (rule @@ -398,10 +362,9 @@ (action (diff break_separators.ml break_separators.ml.output))) (rule - (targets break_sequence_before.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_sequence_before.ml.output (run %{bin:ocamlformat} %{dep:break_sequence_before.ml})))) (rule @@ -409,10 +372,9 @@ (action (diff break_sequence_before.ml break_sequence_before.ml.output))) (rule - (targets break_string_literals-never.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_string_literals-never.ml.output (run %{bin:ocamlformat} --break-string-literals=never %{dep:break_string_literals.ml})))) (rule @@ -420,10 +382,9 @@ (action (diff break_string_literals-never.ml.ref break_string_literals-never.ml.output))) (rule - (targets break_string_literals-wrap.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_string_literals-wrap.ml.output (with-accepted-exit-codes 1 (run %{bin:ocamlformat} --break-string-literals=wrap %{dep:break_string_literals.ml}))))) @@ -432,10 +393,9 @@ (action (diff break_string_literals-wrap.ml.ref break_string_literals-wrap.ml.output))) (rule - (targets break_string_literals.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_string_literals.ml.output (run %{bin:ocamlformat} --break-string-literals=auto %{dep:break_string_literals.ml})))) (rule @@ -443,10 +403,9 @@ (action (diff break_string_literals.ml.ref break_string_literals.ml.output))) (rule - (targets break_struct.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to break_struct.ml.output (run %{bin:ocamlformat} %{dep:break_struct.ml})))) (rule @@ -454,10 +413,9 @@ (action (diff break_struct.ml.ref break_struct.ml.output))) (rule - (targets cinaps.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to cinaps.ml.output (run %{bin:ocamlformat} %{dep:cinaps.ml})))) (rule @@ -465,10 +423,9 @@ (action (diff cinaps.ml cinaps.ml.output))) (rule - (targets cmdline_override.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to cmdline_override.ml.output (run %{bin:ocamlformat} --config=module-item-spacing=compact --module-item-spacing=sparse %{dep:cmdline_override.ml})))) (rule @@ -476,10 +433,9 @@ (action (diff cmdline_override.ml cmdline_override.ml.output))) (rule - (targets cmdline_override2.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to cmdline_override2.ml.output (run %{bin:ocamlformat} --module-item-spacing=sparse --config=module-item-spacing=compact %{dep:cmdline_override2.ml})))) (rule @@ -487,10 +443,9 @@ (action (diff cmdline_override2.ml cmdline_override2.ml.output))) (rule - (targets comment_breaking.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comment_breaking.ml.output (run %{bin:ocamlformat} %{dep:comment_breaking.ml})))) (rule @@ -498,10 +453,9 @@ (action (diff comment_breaking.ml comment_breaking.ml.output))) (rule - (targets comment_header.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comment_header.ml.output (run %{bin:ocamlformat} %{dep:comment_header.ml})))) (rule @@ -509,10 +463,9 @@ (action (diff comment_header.ml.ref comment_header.ml.output))) (rule - (targets comment_in_empty.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comment_in_empty.ml.output (run %{bin:ocamlformat} %{dep:comment_in_empty.ml})))) (rule @@ -520,10 +473,9 @@ (action (diff comment_in_empty.ml comment_in_empty.ml.output))) (rule - (targets comment_in_modules.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comment_in_modules.ml.output (run %{bin:ocamlformat} %{dep:comment_in_modules.ml})))) (rule @@ -531,10 +483,9 @@ (action (diff comment_in_modules.ml.ref comment_in_modules.ml.output))) (rule - (targets comment_last.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comment_last.ml.output (run %{bin:ocamlformat} %{dep:comment_last.ml})))) (rule @@ -542,10 +493,9 @@ (action (diff comment_last.ml comment_last.ml.output))) (rule - (targets comment_sparse.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comment_sparse.ml.output (run %{bin:ocamlformat} %{dep:comment_sparse.ml})))) (rule @@ -553,10 +503,9 @@ (action (diff comment_sparse.ml comment_sparse.ml.output))) (rule - (targets comments.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comments.ml.output (run %{bin:ocamlformat} --max-iter=4 %{dep:comments.ml})))) (rule @@ -565,10 +514,9 @@ (action (diff comments.ml.ref comments.ml.output))) (rule - (targets comments_args.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comments_args.ml.output (run %{bin:ocamlformat} --max-iter=4 %{dep:comments_args.ml})))) (rule @@ -576,10 +524,9 @@ (action (diff comments_args.ml.ref comments_args.ml.output))) (rule - (targets comments_around_disabled.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comments_around_disabled.ml.output (run %{bin:ocamlformat} %{dep:comments_around_disabled.ml})))) (rule @@ -587,10 +534,9 @@ (action (diff comments_around_disabled.ml.ref comments_around_disabled.ml.output))) (rule - (targets comments_in_record.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to comments_in_record.ml.output (run %{bin:ocamlformat} %{dep:comments_in_record.ml})))) (rule @@ -599,10 +545,9 @@ (action (diff comments_in_record.ml.ref comments_in_record.ml.output))) (rule - (targets compact_lists_arrays.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to compact_lists_arrays.ml.output (run %{bin:ocamlformat} %{dep:compact_lists_arrays.ml})))) (rule @@ -610,10 +555,9 @@ (action (diff compact_lists_arrays.ml compact_lists_arrays.ml.output))) (rule - (targets custom_list.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to custom_list.ml.output (run %{bin:ocamlformat} %{dep:custom_list.ml})))) (rule @@ -621,10 +565,9 @@ (action (diff custom_list.ml custom_list.ml.output))) (rule - (targets directives.mlt.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to directives.mlt.output (run %{bin:ocamlformat} %{dep:directives.mlt})))) (rule @@ -633,10 +576,9 @@ (action (diff directives.mlt.ref directives.mlt.output))) (rule - (targets disabled.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to disabled.ml.output (run %{bin:ocamlformat} --disable %{dep:disabled.ml})))) (rule @@ -644,10 +586,9 @@ (action (diff disabled.ml disabled.ml.output))) (rule - (targets disambiguate.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to disambiguate.ml.output (run %{bin:ocamlformat} %{dep:disambiguate.ml})))) (rule @@ -655,10 +596,9 @@ (action (diff disambiguate.ml disambiguate.ml.output))) (rule - (targets doc_comments-after.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to doc_comments-after.ml.output (run %{bin:ocamlformat} --doc-comments=after-when-possible %{dep:doc_comments.ml})))) (rule @@ -667,10 +607,9 @@ (action (diff doc_comments-after.ml.ref doc_comments-after.ml.output))) (rule - (targets doc_comments-before-except-val.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to doc_comments-before-except-val.ml.output (run %{bin:ocamlformat} --doc-comments=before-except-val %{dep:doc_comments.ml})))) (rule @@ -679,10 +618,9 @@ (action (diff doc_comments-before-except-val.ml.ref doc_comments-before-except-val.ml.output))) (rule - (targets doc_comments-before.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to doc_comments-before.ml.output (run %{bin:ocamlformat} --doc-comments=before %{dep:doc_comments.ml})))) (rule @@ -691,10 +629,9 @@ (action (diff doc_comments-before.ml.ref doc_comments-before.ml.output))) (rule - (targets doc_comments.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to doc_comments.ml.output (run %{bin:ocamlformat} %{dep:doc_comments.ml})))) (rule @@ -703,10 +640,9 @@ (action (diff doc_comments.ml.ref doc_comments.ml.output))) (rule - (targets doc_comments.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to doc_comments.mli.output (run %{bin:ocamlformat} %{dep:doc_comments.mli})))) (rule @@ -715,10 +651,9 @@ (action (diff doc_comments.mli.ref doc_comments.mli.output))) (rule - (targets doc_comments_padding.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to doc_comments_padding.ml.output (run %{bin:ocamlformat} %{dep:doc_comments_padding.ml})))) (rule @@ -726,10 +661,9 @@ (action (diff doc_comments_padding.ml doc_comments_padding.ml.output))) (rule - (targets empty.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to empty.ml.output (run %{bin:ocamlformat} %{dep:empty.ml})))) (rule @@ -737,10 +671,9 @@ (action (diff empty.ml empty.ml.output))) (rule - (targets empty_ml.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to empty_ml.ml.output (run %{bin:ocamlformat} %{dep:empty_ml.ml})))) (rule @@ -748,10 +681,9 @@ (action (diff empty_ml.ml empty_ml.ml.output))) (rule - (targets empty_mli.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to empty_mli.mli.output (run %{bin:ocamlformat} %{dep:empty_mli.mli})))) (rule @@ -759,10 +691,9 @@ (action (diff empty_mli.mli empty_mli.mli.output))) (rule - (targets empty_mlt.mlt.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to empty_mlt.mlt.output (run %{bin:ocamlformat} %{dep:empty_mlt.mlt})))) (rule @@ -770,10 +701,9 @@ (action (diff empty_mlt.mlt empty_mlt.mlt.output))) (rule - (targets error1.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to error1.ml.output (with-accepted-exit-codes 1 (run %{bin:ocamlformat} %{dep:error1.ml}))))) @@ -782,10 +712,9 @@ (action (diff error1.ml.ref error1.ml.output))) (rule - (targets error2.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to error2.ml.output (with-accepted-exit-codes 1 (run %{bin:ocamlformat} %{dep:error2.ml}))))) @@ -794,10 +723,9 @@ (action (diff error2.ml.ref error2.ml.output))) (rule - (targets error3.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to error3.ml.output (with-accepted-exit-codes 1 (run %{bin:ocamlformat} %{dep:error3.ml}))))) @@ -806,10 +734,9 @@ (action (diff error3.ml.ref error3.ml.output))) (rule - (targets error4.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to error4.ml.output (run %{bin:ocamlformat} --no-comment-check %{dep:error4.ml})))) (rule @@ -817,10 +744,9 @@ (action (diff error4.ml.ref error4.ml.output))) (rule - (targets exceptions.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to exceptions.ml.output (run %{bin:ocamlformat} %{dep:exceptions.ml})))) (rule @@ -828,10 +754,9 @@ (action (diff exceptions.ml exceptions.ml.output))) (rule - (targets exp_grouping-parens.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to exp_grouping-parens.ml.output (run %{bin:ocamlformat} --exp-grouping=parens %{dep:exp_grouping.ml})))) (rule @@ -839,10 +764,9 @@ (action (diff exp_grouping-parens.ml.ref exp_grouping-parens.ml.output))) (rule - (targets exp_grouping.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to exp_grouping.ml.output (run %{bin:ocamlformat} --exp-grouping=preserve %{dep:exp_grouping.ml})))) (rule @@ -850,10 +774,9 @@ (action (diff exp_grouping.ml.ref exp_grouping.ml.output))) (rule - (targets exp_record.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to exp_record.ml.output (run %{bin:ocamlformat} %{dep:exp_record.ml})))) (rule @@ -861,10 +784,9 @@ (action (diff exp_record.ml exp_record.ml.output))) (rule - (targets expect_test.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to expect_test.ml.output (run %{bin:ocamlformat} %{dep:expect_test.ml})))) (rule @@ -872,10 +794,9 @@ (action (diff expect_test.ml expect_test.ml.output))) (rule - (targets extensions-indent.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to extensions-indent.ml.output (run %{bin:ocamlformat} --max-iters=3 --extension-indent=5 --stritem-extension-indent=3 %{dep:extensions.ml})))) (rule @@ -884,10 +805,9 @@ (action (diff extensions-indent.ml.ref extensions-indent.ml.output))) (rule - (targets extensions-indent.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to extensions-indent.mli.output (run %{bin:ocamlformat} --extension-indent=5 --stritem-extension-indent=3 %{dep:extensions.mli})))) (rule @@ -895,10 +815,9 @@ (action (diff extensions-indent.mli.ref extensions-indent.mli.output))) (rule - (targets extensions-sugar_always.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to extensions-sugar_always.ml.output (run %{bin:ocamlformat} --max-iters=3 --extension-sugar=always %{dep:extensions.ml})))) (rule @@ -907,10 +826,9 @@ (action (diff extensions-sugar_always.ml.ref extensions-sugar_always.ml.output))) (rule - (targets extensions.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to extensions.ml.output (run %{bin:ocamlformat} --max-iters=3 %{dep:extensions.ml})))) (rule @@ -919,10 +837,9 @@ (action (diff extensions.ml.ref extensions.ml.output))) (rule - (targets extensions.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to extensions.mli.output (run %{bin:ocamlformat} %{dep:extensions.mli})))) (rule @@ -930,10 +847,9 @@ (action (diff extensions.mli extensions.mli.output))) (rule - (targets field-op_begin_line.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to field-op_begin_line.ml.output (run %{bin:ocamlformat} --assignment-operator=begin-line %{dep:field.ml})))) (rule @@ -941,10 +857,9 @@ (action (diff field-op_begin_line.ml.ref field-op_begin_line.ml.output))) (rule - (targets field.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to field.ml.output (run %{bin:ocamlformat} %{dep:field.ml})))) (rule @@ -952,10 +867,9 @@ (action (diff field.ml field.ml.output))) (rule - (targets first_class_module.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to first_class_module.ml.output (run %{bin:ocamlformat} %{dep:first_class_module.ml})))) (rule @@ -963,10 +877,9 @@ (action (diff first_class_module.ml first_class_module.ml.output))) (rule - (targets floating_doc.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to floating_doc.ml.output (run %{bin:ocamlformat} %{dep:floating_doc.ml})))) (rule @@ -974,10 +887,9 @@ (action (diff floating_doc.ml floating_doc.ml.output))) (rule - (targets for_while.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to for_while.ml.output (run %{bin:ocamlformat} %{dep:for_while.ml})))) (rule @@ -985,10 +897,9 @@ (action (diff for_while.ml for_while.ml.output))) (rule - (targets format_invalid_files.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to format_invalid_files.ml.output (run %{bin:ocamlformat} --format-invalid-files=auto %{dep:format_invalid_files.ml})))) (rule @@ -996,10 +907,9 @@ (action (diff format_invalid_files.ml.ref format_invalid_files.ml.output))) (rule - (targets fun_decl.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to fun_decl.ml.output (run %{bin:ocamlformat} %{dep:fun_decl.ml})))) (rule @@ -1007,10 +917,9 @@ (action (diff fun_decl.ml fun_decl.ml.output))) (rule - (targets function_indent-never.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to function_indent-never.ml.output (run %{bin:ocamlformat} --function-indent=4 --function-indent-nested=never %{dep:function_indent.ml})))) (rule @@ -1018,10 +927,9 @@ (action (diff function_indent-never.ml.ref function_indent-never.ml.output))) (rule - (targets function_indent.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to function_indent.ml.output (run %{bin:ocamlformat} --function-indent=4 --function-indent-nested=always %{dep:function_indent.ml})))) (rule @@ -1029,10 +937,9 @@ (action (diff function_indent.ml.ref function_indent.ml.output))) (rule - (targets functor.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to functor.ml.output (run %{bin:ocamlformat} %{dep:functor.ml})))) (rule @@ -1040,10 +947,9 @@ (action (diff functor.ml functor.ml.output))) (rule - (targets funsig.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to funsig.ml.output (run %{bin:ocamlformat} %{dep:funsig.ml})))) (rule @@ -1051,10 +957,9 @@ (action (diff funsig.ml funsig.ml.output))) (rule - (targets gadt.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to gadt.ml.output (run %{bin:ocamlformat} %{dep:gadt.ml})))) (rule @@ -1062,10 +967,9 @@ (action (diff gadt.ml gadt.ml.output))) (rule - (targets generative.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to generative.ml.output (run %{bin:ocamlformat} %{dep:generative.ml})))) (rule @@ -1073,10 +977,9 @@ (action (diff generative.ml generative.ml.output))) (rule - (targets index_op.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to index_op.ml.output (run %{bin:ocamlformat} %{dep:index_op.ml})))) (rule @@ -1084,10 +987,9 @@ (action (diff index_op.ml index_op.ml.output))) (rule - (targets infix_arg_grouping.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to infix_arg_grouping.ml.output (run %{bin:ocamlformat} %{dep:infix_arg_grouping.ml})))) (rule @@ -1095,10 +997,9 @@ (action (diff infix_arg_grouping.ml infix_arg_grouping.ml.output))) (rule - (targets infix_bind-break.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to infix_bind-break.ml.output (run %{bin:ocamlformat} --break-infix=wrap --break-infix-before-func %{dep:infix_bind.ml})))) (rule @@ -1107,10 +1008,9 @@ (action (diff infix_bind-break.ml.ref infix_bind-break.ml.output))) (rule - (targets infix_bind-fit_or_vertical-break.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to infix_bind-fit_or_vertical-break.ml.output (run %{bin:ocamlformat} --break-infix=fit-or-vertical --break-infix-before-func %{dep:infix_bind.ml})))) (rule @@ -1119,10 +1019,9 @@ (action (diff infix_bind-fit_or_vertical-break.ml.ref infix_bind-fit_or_vertical-break.ml.output))) (rule - (targets infix_bind-fit_or_vertical.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to infix_bind-fit_or_vertical.ml.output (run %{bin:ocamlformat} --break-infix=fit-or-vertical --no-break-infix-before-func %{dep:infix_bind.ml})))) (rule @@ -1131,10 +1030,9 @@ (action (diff infix_bind-fit_or_vertical.ml.ref infix_bind-fit_or_vertical.ml.output))) (rule - (targets infix_bind.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to infix_bind.ml.output (run %{bin:ocamlformat} --break-infix=wrap --no-break-infix-before-func %{dep:infix_bind.ml})))) (rule @@ -1143,10 +1041,9 @@ (action (diff infix_bind.ml infix_bind.ml.output))) (rule - (targets infix_precedence.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to infix_precedence.ml.output (run %{bin:ocamlformat} --infix-precedence=parens %{dep:infix_precedence.ml})))) (rule @@ -1154,10 +1051,9 @@ (action (diff infix_precedence.ml infix_precedence.ml.output))) (rule - (targets invalid.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to invalid.ml.output (run %{bin:ocamlformat} %{dep:invalid.ml})))) (rule @@ -1165,10 +1061,9 @@ (action (diff invalid.ml invalid.ml.output))) (rule - (targets invalid_docstring.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to invalid_docstring.ml.output (run %{bin:ocamlformat} %{dep:invalid_docstring.ml})))) (rule @@ -1177,10 +1072,9 @@ (action (diff invalid_docstring.ml.ref invalid_docstring.ml.output))) (rule - (targets issue114.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue114.ml.output (run %{bin:ocamlformat} %{dep:issue114.ml})))) (rule @@ -1188,10 +1082,9 @@ (action (diff issue114.ml issue114.ml.output))) (rule - (targets issue289.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue289.ml.output (run %{bin:ocamlformat} %{dep:issue289.ml})))) (rule @@ -1199,10 +1092,9 @@ (action (diff issue289.ml issue289.ml.output))) (rule - (targets issue48.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue48.ml.output (run %{bin:ocamlformat} %{dep:issue48.ml})))) (rule @@ -1210,10 +1102,9 @@ (action (diff issue48.ml issue48.ml.output))) (rule - (targets issue51.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue51.ml.output (run %{bin:ocamlformat} %{dep:issue51.ml})))) (rule @@ -1221,10 +1112,9 @@ (action (diff issue51.ml issue51.ml.output))) (rule - (targets issue57.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue57.ml.output (run %{bin:ocamlformat} %{dep:issue57.ml})))) (rule @@ -1232,10 +1122,9 @@ (action (diff issue57.ml issue57.ml.output))) (rule - (targets issue60.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue60.ml.output (run %{bin:ocamlformat} %{dep:issue60.ml})))) (rule @@ -1243,10 +1132,9 @@ (action (diff issue60.ml issue60.ml.output))) (rule - (targets issue77.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue77.ml.output (run %{bin:ocamlformat} %{dep:issue77.ml})))) (rule @@ -1254,10 +1142,9 @@ (action (diff issue77.ml issue77.ml.output))) (rule - (targets issue85.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue85.ml.output (run %{bin:ocamlformat} %{dep:issue85.ml})))) (rule @@ -1265,10 +1152,9 @@ (action (diff issue85.ml issue85.ml.output))) (rule - (targets issue89.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to issue89.ml.output (run %{bin:ocamlformat} %{dep:issue89.ml})))) (rule @@ -1276,10 +1162,9 @@ (action (diff issue89.ml issue89.ml.output))) (rule - (targets ite-compact.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-compact.ml.output (run %{bin:ocamlformat} --if-then-else=compact %{dep:ite.ml})))) (rule @@ -1287,10 +1172,9 @@ (action (diff ite-compact.ml.ref ite-compact.ml.output))) (rule - (targets ite-compact_closing.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-compact_closing.ml.output (run %{bin:ocamlformat} --if-then-else=compact --indicate-multiline-delimiters=closing-on-separate-line %{dep:ite.ml})))) (rule @@ -1298,10 +1182,9 @@ (action (diff ite-compact_closing.ml.ref ite-compact_closing.ml.output))) (rule - (targets ite-fit_or_vertical.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-fit_or_vertical.ml.output (run %{bin:ocamlformat} --if-then-else=fit-or-vertical %{dep:ite.ml})))) (rule @@ -1309,10 +1192,9 @@ (action (diff ite-fit_or_vertical.ml.ref ite-fit_or_vertical.ml.output))) (rule - (targets ite-fit_or_vertical_closing.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-fit_or_vertical_closing.ml.output (run %{bin:ocamlformat} --if-then-else fit-or-vertical --indicate-multiline-delimiters=closing-on-separate-line %{dep:ite.ml})))) (rule @@ -1320,10 +1202,9 @@ (action (diff ite-fit_or_vertical_closing.ml.ref ite-fit_or_vertical_closing.ml.output))) (rule - (targets ite-fit_or_vertical_no_indicate.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-fit_or_vertical_no_indicate.ml.output (run %{bin:ocamlformat} --if-then-else=fit-or-vertical --indicate-multiline-delimiters=no %{dep:ite.ml})))) (rule @@ -1331,10 +1212,9 @@ (action (diff ite-fit_or_vertical_no_indicate.ml.ref ite-fit_or_vertical_no_indicate.ml.output))) (rule - (targets ite-kr.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-kr.ml.output (run %{bin:ocamlformat} --if-then-else=k-r --max-iters=3 %{dep:ite.ml})))) (rule @@ -1342,10 +1222,9 @@ (action (diff ite-kr.ml.ref ite-kr.ml.output))) (rule - (targets ite-kr_closing.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-kr_closing.ml.output (run %{bin:ocamlformat} --if-then-else=k-r --max-iters=3 --indicate-multiline-delimiters=closing-on-separate-line %{dep:ite.ml})))) (rule @@ -1353,10 +1232,9 @@ (action (diff ite-kr_closing.ml.ref ite-kr_closing.ml.output))) (rule - (targets ite-kw_first.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-kw_first.ml.output (run %{bin:ocamlformat} --if-then-else=keyword-first %{dep:ite.ml})))) (rule @@ -1364,10 +1242,9 @@ (action (diff ite-kw_first.ml.ref ite-kw_first.ml.output))) (rule - (targets ite-kw_first_closing.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-kw_first_closing.ml.output (run %{bin:ocamlformat} --if-then-else keyword-first --indicate-multiline-delimiters=closing-on-separate-line %{dep:ite.ml})))) (rule @@ -1375,10 +1252,9 @@ (action (diff ite-kw_first_closing.ml.ref ite-kw_first_closing.ml.output))) (rule - (targets ite-kw_first_no_indicate.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-kw_first_no_indicate.ml.output (run %{bin:ocamlformat} --if-then-else=keyword-first --indicate-multiline-delimiters=no %{dep:ite.ml})))) (rule @@ -1386,10 +1262,9 @@ (action (diff ite-kw_first_no_indicate.ml.ref ite-kw_first_no_indicate.ml.output))) (rule - (targets ite-no_indicate.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite-no_indicate.ml.output (run %{bin:ocamlformat} --if-then-else=compact --indicate-multiline-delimiters=no %{dep:ite.ml})))) (rule @@ -1397,10 +1272,9 @@ (action (diff ite-no_indicate.ml.ref ite-no_indicate.ml.output))) (rule - (targets ite.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ite.ml.output (run %{bin:ocamlformat} --if-then-else=compact %{dep:ite.ml})))) (rule @@ -1408,10 +1282,9 @@ (action (diff ite.ml.ref ite.ml.output))) (rule - (targets js_sig.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to js_sig.mli.output (run %{bin:ocamlformat} --profile=janestreet %{dep:js_sig.mli})))) (rule @@ -1419,10 +1292,9 @@ (action (diff js_sig.mli.ref js_sig.mli.output))) (rule - (targets js_source.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to js_source.ml.output (run %{bin:ocamlformat} --max-iters=3 --profile=janestreet %{dep:js_source.ml})))) (rule @@ -1431,10 +1303,9 @@ (action (diff js_source.ml.ref js_source.ml.output))) (rule - (targets js_source.ml.ocp.output) (deps .ocp-indent ) (action - (with-outputs-to %{targets} + (with-outputs-to js_source.ml.ocp.output (run %{bin:ocp-indent} %{dep:js_source.ml.ref})))) (rule @@ -1442,10 +1313,9 @@ (action (diff js_source.ml.ocp js_source.ml.ocp.output))) (rule - (targets kw_extentions.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to kw_extentions.ml.output (run %{bin:ocamlformat} %{dep:kw_extentions.ml})))) (rule @@ -1453,10 +1323,9 @@ (action (diff kw_extentions.ml kw_extentions.ml.output))) (rule - (targets label_option_default_args.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to label_option_default_args.ml.output (run %{bin:ocamlformat} --max-iters=4 %{dep:label_option_default_args.ml})))) (rule @@ -1464,10 +1333,9 @@ (action (diff label_option_default_args.ml.ref label_option_default_args.ml.output))) (rule - (targets lazy.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to lazy.ml.output (run %{bin:ocamlformat} %{dep:lazy.ml})))) (rule @@ -1475,10 +1343,9 @@ (action (diff lazy.ml lazy.ml.output))) (rule - (targets let_binding-in_indent.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to let_binding-in_indent.ml.output (run %{bin:ocamlformat} --indent-after-in=4 %{dep:let_binding.ml})))) (rule @@ -1487,10 +1354,9 @@ (action (diff let_binding-in_indent.ml.ref let_binding-in_indent.ml.output))) (rule - (targets let_binding-indent.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to let_binding-indent.ml.output (run %{bin:ocamlformat} --let-binding-indent=6 %{dep:let_binding.ml})))) (rule @@ -1499,10 +1365,9 @@ (action (diff let_binding-indent.ml.ref let_binding-indent.ml.output))) (rule - (targets let_binding.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to let_binding.ml.output (run %{bin:ocamlformat} %{dep:let_binding.ml})))) (rule @@ -1511,10 +1376,9 @@ (action (diff let_binding.ml.ref let_binding.ml.output))) (rule - (targets let_in_constr.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to let_in_constr.ml.output (run %{bin:ocamlformat} %{dep:let_in_constr.ml})))) (rule @@ -1522,10 +1386,9 @@ (action (diff let_in_constr.ml let_in_constr.ml.output))) (rule - (targets let_module-sparse.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to let_module-sparse.ml.output (run %{bin:ocamlformat} --let-module=sparse %{dep:let_module.ml})))) (rule @@ -1533,10 +1396,9 @@ (action (diff let_module-sparse.ml.ref let_module-sparse.ml.output))) (rule - (targets let_module.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to let_module.ml.output (run %{bin:ocamlformat} --let-module=compact %{dep:let_module.ml})))) (rule @@ -1544,10 +1406,9 @@ (action (diff let_module.ml.ref let_module.ml.output))) (rule - (targets list-space_around.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to list-space_around.ml.output (run %{bin:ocamlformat} --space-around-arrays --space-around-lists --space-around-records --space-around-variants %{dep:list.ml})))) (rule @@ -1555,10 +1416,9 @@ (action (diff list-space_around.ml.ref list-space_around.ml.output))) (rule - (targets list.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to list.ml.output (run %{bin:ocamlformat} %{dep:list.ml})))) (rule @@ -1566,10 +1426,9 @@ (action (diff list.ml list.ml.output))) (rule - (targets loc_stack.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to loc_stack.ml.output (run %{bin:ocamlformat} -n 3 %{dep:loc_stack.ml})))) (rule @@ -1577,10 +1436,9 @@ (action (diff loc_stack.ml.ref loc_stack.ml.output))) (rule - (targets locally_abtract_types.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to locally_abtract_types.ml.output (run %{bin:ocamlformat} %{dep:locally_abtract_types.ml})))) (rule @@ -1588,10 +1446,9 @@ (action (diff locally_abtract_types.ml locally_abtract_types.ml.output))) (rule - (targets margin_80.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to margin_80.ml.output (run %{bin:ocamlformat} --margin=80 %{dep:margin_80.ml})))) (rule @@ -1599,10 +1456,9 @@ (action (diff margin_80.ml.ref margin_80.ml.output))) (rule - (targets match.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to match.ml.output (run %{bin:ocamlformat} %{dep:match.ml})))) (rule @@ -1610,10 +1466,9 @@ (action (diff match.ml match.ml.output))) (rule - (targets match2.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to match2.ml.output (run %{bin:ocamlformat} --leading-nested-match-parens %{dep:match2.ml})))) (rule @@ -1622,10 +1477,9 @@ (action (diff match2.ml match2.ml.output))) (rule - (targets match_indent-never.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to match_indent-never.ml.output (run %{bin:ocamlformat} --match-indent=4 --match-indent-nested=never %{dep:match_indent.ml})))) (rule @@ -1633,10 +1487,9 @@ (action (diff match_indent-never.ml.ref match_indent-never.ml.output))) (rule - (targets match_indent.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to match_indent.ml.output (run %{bin:ocamlformat} --match-indent=4 --match-indent-nested=always %{dep:match_indent.ml})))) (rule @@ -1644,10 +1497,9 @@ (action (diff match_indent.ml.ref match_indent.ml.output))) (rule - (targets max_indent.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to max_indent.ml.output (run %{bin:ocamlformat} --max-indent=2 %{dep:max_indent.ml})))) (rule @@ -1655,10 +1507,9 @@ (action (diff max_indent.ml max_indent.ml.output))) (rule - (targets module.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to module.ml.output (run %{bin:ocamlformat} %{dep:module.ml})))) (rule @@ -1666,10 +1517,9 @@ (action (diff module.ml module.ml.output))) (rule - (targets module_anonymous.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to module_anonymous.ml.output (run %{bin:ocamlformat} %{dep:module_anonymous.ml})))) (rule @@ -1678,10 +1528,9 @@ (action (diff module_anonymous.ml module_anonymous.ml.output))) (rule - (targets module_attributes.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to module_attributes.ml.output (run %{bin:ocamlformat} %{dep:module_attributes.ml})))) (rule @@ -1689,10 +1538,9 @@ (action (diff module_attributes.ml.ref module_attributes.ml.output))) (rule - (targets module_item_spacing-preserve.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to module_item_spacing-preserve.ml.output (run %{bin:ocamlformat} --max-iter=3 --module-item-spacing=preserve %{dep:module_item_spacing.ml})))) (rule @@ -1700,10 +1548,9 @@ (action (diff module_item_spacing-preserve.ml.ref module_item_spacing-preserve.ml.output))) (rule - (targets module_item_spacing-sparse.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to module_item_spacing-sparse.ml.output (run %{bin:ocamlformat} --max-iter=3 --module-item-spacing=sparse %{dep:module_item_spacing.ml})))) (rule @@ -1711,10 +1558,9 @@ (action (diff module_item_spacing-sparse.ml.ref module_item_spacing-sparse.ml.output))) (rule - (targets module_item_spacing.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to module_item_spacing.ml.output (run %{bin:ocamlformat} --max-iter=3 --module-item-spacing=compact %{dep:module_item_spacing.ml})))) (rule @@ -1722,10 +1568,9 @@ (action (diff module_item_spacing.ml.ref module_item_spacing.ml.output))) (rule - (targets module_item_spacing.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to module_item_spacing.mli.output (run %{bin:ocamlformat} --max-iter=3 %{dep:module_item_spacing.mli})))) (rule @@ -1734,10 +1579,9 @@ (action (diff module_item_spacing.mli.ref module_item_spacing.mli.output))) (rule - (targets module_type.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to module_type.ml.output (run %{bin:ocamlformat} %{dep:module_type.ml})))) (rule @@ -1745,10 +1589,9 @@ (action (diff module_type.ml module_type.ml.output))) (rule - (targets monadic_binding.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to monadic_binding.ml.output (run %{bin:ocamlformat} %{dep:monadic_binding.ml})))) (rule @@ -1757,10 +1600,9 @@ (action (diff monadic_binding.ml monadic_binding.ml.output))) (rule - (targets multi_index_op.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to multi_index_op.ml.output (run %{bin:ocamlformat} %{dep:multi_index_op.ml})))) (rule @@ -1769,10 +1611,9 @@ (action (diff multi_index_op.ml multi_index_op.ml.output))) (rule - (targets need_format.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to need_format.ml.output (with-accepted-exit-codes 1 (run %{bin:ocamlformat} --max-iters=1 %{dep:need_format.ml}))))) @@ -1781,10 +1622,9 @@ (action (diff need_format.ml.ref need_format.ml.output))) (rule - (targets new.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to new.ml.output (run %{bin:ocamlformat} %{dep:new.ml})))) (rule @@ -1792,10 +1632,9 @@ (action (diff new.ml new.ml.output))) (rule - (targets object.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to object.ml.output (run %{bin:ocamlformat} %{dep:object.ml})))) (rule @@ -1803,10 +1642,9 @@ (action (diff object.ml object.ml.output))) (rule - (targets object_type.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to object_type.ml.output (run %{bin:ocamlformat} %{dep:object_type.ml})))) (rule @@ -1814,10 +1652,9 @@ (action (diff object_type.ml.ref object_type.ml.output))) (rule - (targets ocp_indent_compat.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ocp_indent_compat.ml.output (run %{bin:ocamlformat} %{dep:ocp_indent_compat.ml})))) (rule @@ -1825,10 +1662,9 @@ (action (diff ocp_indent_compat.ml ocp_indent_compat.ml.output))) (rule - (targets ocp_indent_options.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to ocp_indent_options.ml.output (run %{bin:ocamlformat} --ocp-indent-config %{dep:ocp_indent_options.ml})))) (rule @@ -1836,10 +1672,9 @@ (action (diff ocp_indent_options.ml.ref ocp_indent_options.ml.output))) (rule - (targets open-auto.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to open-auto.ml.output (run %{bin:ocamlformat} --let-open=auto %{dep:open.ml})))) (rule @@ -1848,10 +1683,9 @@ (action (diff open-auto.ml.ref open-auto.ml.output))) (rule - (targets open-long.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to open-long.ml.output (run %{bin:ocamlformat} --let-open=long %{dep:open.ml})))) (rule @@ -1860,10 +1694,9 @@ (action (diff open-long.ml.ref open-long.ml.output))) (rule - (targets open-preserve.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to open-preserve.ml.output (run %{bin:ocamlformat} --let-open=preserve %{dep:open.ml})))) (rule @@ -1872,10 +1705,9 @@ (action (diff open-preserve.ml.ref open-preserve.ml.output))) (rule - (targets open-short.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to open-short.ml.output (run %{bin:ocamlformat} --let-open=short %{dep:open.ml})))) (rule @@ -1884,10 +1716,9 @@ (action (diff open-short.ml.ref open-short.ml.output))) (rule - (targets open.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to open.ml.output (run %{bin:ocamlformat} %{dep:open.ml})))) (rule @@ -1896,10 +1727,9 @@ (action (diff open.ml.ref open.ml.output))) (rule - (targets open_types.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to open_types.ml.output (run %{bin:ocamlformat} %{dep:open_types.ml})))) (rule @@ -1907,10 +1737,9 @@ (action (diff open_types.ml open_types.ml.output))) (rule - (targets option.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to option.ml.output (run %{bin:ocamlformat} %{dep:option.ml})))) (rule @@ -1918,10 +1747,9 @@ (action (diff option.ml.ref option.ml.output))) (rule - (targets parens_tuple_patterns.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to parens_tuple_patterns.ml.output (run %{bin:ocamlformat} %{dep:parens_tuple_patterns.ml})))) (rule @@ -1929,10 +1757,9 @@ (action (diff parens_tuple_patterns.ml parens_tuple_patterns.ml.output))) (rule - (targets precedence.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to precedence.ml.output (run %{bin:ocamlformat} %{dep:precedence.ml})))) (rule @@ -1940,10 +1767,9 @@ (action (diff precedence.ml precedence.ml.output))) (rule - (targets prefix_infix.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to prefix_infix.ml.output (run %{bin:ocamlformat} %{dep:prefix_infix.ml})))) (rule @@ -1951,10 +1777,9 @@ (action (diff prefix_infix.ml prefix_infix.ml.output))) (rule - (targets print_config.ml.output) (deps .ocamlformat dir1/dir2/.ocamlformat dir1/dir2/print_config.ml) (action - (with-outputs-to %{targets} + (with-outputs-to print_config.ml.output (run %{bin:ocamlformat} dir1/dir2/print_config.ml --print-config --let-open=short --config=max-iters=2 %{dep:print_config.ml})))) (rule @@ -1962,10 +1787,9 @@ (action (diff print_config.ml.ref print_config.ml.output))) (rule - (targets profiles.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to profiles.ml.output (run %{bin:ocamlformat} --config=margin=20 --profile=janestreet --module-item-spacing=sparse %{dep:profiles.ml})))) (rule @@ -1973,10 +1797,9 @@ (action (diff profiles.ml profiles.ml.output))) (rule - (targets profiles2.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to profiles2.ml.output (run %{bin:ocamlformat} --profile=janestreet %{dep:profiles2.ml})))) (rule @@ -1984,10 +1807,9 @@ (action (diff profiles2.ml profiles2.ml.output))) (rule - (targets protected_object_types.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to protected_object_types.ml.output (run %{bin:ocamlformat} %{dep:protected_object_types.ml})))) (rule @@ -1995,10 +1817,9 @@ (action (diff protected_object_types.ml protected_object_types.ml.output))) (rule - (targets recmod.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to recmod.mli.output (run %{bin:ocamlformat} %{dep:recmod.mli})))) (rule @@ -2006,10 +1827,9 @@ (action (diff recmod.mli recmod.mli.output))) (rule - (targets record-loose.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to record-loose.ml.output (run %{bin:ocamlformat} --field-space=loose %{dep:record.ml})))) (rule @@ -2017,10 +1837,9 @@ (action (diff record-loose.ml.ref record-loose.ml.output))) (rule - (targets record-tight_decl.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to record-tight_decl.ml.output (run %{bin:ocamlformat} --field-space=tight-decl %{dep:record.ml})))) (rule @@ -2028,10 +1847,9 @@ (action (diff record-tight_decl.ml.ref record-tight_decl.ml.output))) (rule - (targets record.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to record.ml.output (run %{bin:ocamlformat} --field-space=tight %{dep:record.ml})))) (rule @@ -2039,10 +1857,9 @@ (action (diff record.ml.ref record.ml.output))) (rule - (targets record_punning.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to record_punning.ml.output (run %{bin:ocamlformat} %{dep:record_punning.ml})))) (rule @@ -2050,10 +1867,9 @@ (action (diff record_punning.ml record_punning.ml.output))) (rule - (targets reformat_string.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to reformat_string.ml.output (run %{bin:ocamlformat} --max-iter=2 %{dep:reformat_string.ml})))) (rule @@ -2061,10 +1877,9 @@ (action (diff reformat_string.ml.ref reformat_string.ml.output))) (rule - (targets refs.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to refs.ml.output (run %{bin:ocamlformat} %{dep:refs.ml})))) (rule @@ -2072,10 +1887,9 @@ (action (diff refs.ml refs.ml.output))) (rule - (targets remove_extra_parens.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to remove_extra_parens.ml.output (run %{bin:ocamlformat} %{dep:remove_extra_parens.ml})))) (rule @@ -2083,10 +1897,9 @@ (action (diff remove_extra_parens.ml.ref remove_extra_parens.ml.output))) (rule - (targets revapply_ext.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to revapply_ext.ml.output (run %{bin:ocamlformat} %{dep:revapply_ext.ml})))) (rule @@ -2094,10 +1907,9 @@ (action (diff revapply_ext.ml revapply_ext.ml.output))) (rule - (targets send.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to send.ml.output (run %{bin:ocamlformat} %{dep:send.ml})))) (rule @@ -2105,10 +1917,9 @@ (action (diff send.ml send.ml.output))) (rule - (targets sequence-preserve.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to sequence-preserve.ml.output (run %{bin:ocamlformat} --sequence-blank-line=preserve-one --max-iter=3 %{dep:sequence.ml})))) (rule @@ -2117,10 +1928,9 @@ (action (diff sequence-preserve.ml.ref sequence-preserve.ml.output))) (rule - (targets sequence.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to sequence.ml.output (run %{bin:ocamlformat} --sequence-blank-line=compact --max-iter=3 %{dep:sequence.ml})))) (rule @@ -2129,10 +1939,9 @@ (action (diff sequence.ml.ref sequence.ml.output))) (rule - (targets shebang.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to shebang.ml.output (run %{bin:ocamlformat} %{dep:shebang.ml})))) (rule @@ -2140,10 +1949,9 @@ (action (diff shebang.ml shebang.ml.output))) (rule - (targets shortcut_ext_attr.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to shortcut_ext_attr.ml.output (run %{bin:ocamlformat} %{dep:shortcut_ext_attr.ml})))) (rule @@ -2151,10 +1959,9 @@ (action (diff shortcut_ext_attr.ml shortcut_ext_attr.ml.output))) (rule - (targets skip.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to skip.ml.output (run %{bin:ocamlformat} %{dep:skip.ml})))) (rule @@ -2163,10 +1970,9 @@ (action (diff skip.ml skip.ml.output))) (rule - (targets source.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to source.ml.output (run %{bin:ocamlformat} --max-iters=3 %{dep:source.ml})))) (rule @@ -2175,10 +1981,9 @@ (action (diff source.ml.ref source.ml.output))) (rule - (targets str_value.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to str_value.ml.output (run %{bin:ocamlformat} %{dep:str_value.ml})))) (rule @@ -2186,10 +1991,9 @@ (action (diff str_value.ml str_value.ml.output))) (rule - (targets string.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to string.ml.output (run %{bin:ocamlformat} %{dep:string.ml})))) (rule @@ -2197,10 +2001,9 @@ (action (diff string.ml.ref string.ml.output))) (rule - (targets string_array.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to string_array.ml.output (run %{bin:ocamlformat} %{dep:string_array.ml})))) (rule @@ -2208,10 +2011,9 @@ (action (diff string_array.ml string_array.ml.output))) (rule - (targets string_wrapping.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to string_wrapping.ml.output (run %{bin:ocamlformat} %{dep:string_wrapping.ml})))) (rule @@ -2219,10 +2021,9 @@ (action (diff string_wrapping.ml string_wrapping.ml.output))) (rule - (targets symbol.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to symbol.ml.output (run %{bin:ocamlformat} %{dep:symbol.ml})))) (rule @@ -2230,10 +2031,9 @@ (action (diff symbol.ml symbol.ml.output))) (rule - (targets tag_only.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to tag_only.ml.output (run %{bin:ocamlformat} %{dep:tag_only.ml})))) (rule @@ -2241,10 +2041,9 @@ (action (diff tag_only.ml tag_only.ml.output))) (rule - (targets tag_only.mli.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to tag_only.mli.output (run %{bin:ocamlformat} %{dep:tag_only.mli})))) (rule @@ -2252,10 +2051,9 @@ (action (diff tag_only.mli tag_only.mli.output))) (rule - (targets try_with_or_pattern.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to try_with_or_pattern.ml.output (run %{bin:ocamlformat} %{dep:try_with_or_pattern.ml})))) (rule @@ -2263,10 +2061,9 @@ (action (diff try_with_or_pattern.ml try_with_or_pattern.ml.output))) (rule - (targets tuple.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to tuple.ml.output (run %{bin:ocamlformat} --parens-tuple=always %{dep:tuple.ml})))) (rule @@ -2274,10 +2071,9 @@ (action (diff tuple.ml tuple.ml.output))) (rule - (targets tuple_less_parens.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to tuple_less_parens.ml.output (run %{bin:ocamlformat} --parens-tuple=multi-line-only %{dep:tuple_less_parens.ml})))) (rule @@ -2285,10 +2081,9 @@ (action (diff tuple_less_parens.ml tuple_less_parens.ml.output))) (rule - (targets tuple_type_parens.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to tuple_type_parens.ml.output (run %{bin:ocamlformat} %{dep:tuple_type_parens.ml})))) (rule @@ -2296,10 +2091,9 @@ (action (diff tuple_type_parens.ml tuple_type_parens.ml.output))) (rule - (targets type_and_constraint.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to type_and_constraint.ml.output (run %{bin:ocamlformat} %{dep:type_and_constraint.ml})))) (rule @@ -2307,10 +2101,9 @@ (action (diff type_and_constraint.ml type_and_constraint.ml.output))) (rule - (targets type_annotations.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to type_annotations.ml.output (run %{bin:ocamlformat} %{dep:type_annotations.ml})))) (rule @@ -2318,10 +2111,9 @@ (action (diff type_annotations.ml type_annotations.ml.output))) (rule - (targets types-compact-space_around-docked.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to types-compact-space_around-docked.ml.output (run %{bin:ocamlformat} --type-decl=compact --space-around-arrays --space-around-lists --space-around-records --space-around-variants --break-separators=after --dock-collection-brackets %{dep:types.ml})))) (rule @@ -2330,10 +2122,9 @@ (action (diff types-compact-space_around-docked.ml.ref types-compact-space_around-docked.ml.output))) (rule - (targets types-compact-space_around.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to types-compact-space_around.ml.output (run %{bin:ocamlformat} --type-decl=compact --space-around-arrays --space-around-lists --space-around-records --space-around-variants %{dep:types.ml})))) (rule @@ -2342,10 +2133,9 @@ (action (diff types-compact-space_around.ml.ref types-compact-space_around.ml.output))) (rule - (targets types-compact.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to types-compact.ml.output (run %{bin:ocamlformat} --type-decl=compact %{dep:types.ml})))) (rule @@ -2354,10 +2144,9 @@ (action (diff types-compact.ml.ref types-compact.ml.output))) (rule - (targets types-indent.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to types-indent.ml.output (run %{bin:ocamlformat} --type-decl-indent=6 %{dep:types.ml})))) (rule @@ -2366,10 +2155,9 @@ (action (diff types-indent.ml.ref types-indent.ml.output))) (rule - (targets types-sparse-space_around.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to types-sparse-space_around.ml.output (run %{bin:ocamlformat} --type-decl=sparse --space-around-arrays --space-around-lists --space-around-records --space-around-variants %{dep:types.ml})))) (rule @@ -2378,10 +2166,9 @@ (action (diff types-sparse-space_around.ml.ref types-sparse-space_around.ml.output))) (rule - (targets types-sparse.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to types-sparse.ml.output (run %{bin:ocamlformat} --type-decl=sparse %{dep:types.ml})))) (rule @@ -2390,10 +2177,9 @@ (action (diff types-sparse.ml.ref types-sparse.ml.output))) (rule - (targets types.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to types.ml.output (run %{bin:ocamlformat} %{dep:types.ml})))) (rule @@ -2402,10 +2188,9 @@ (action (diff types.ml types.ml.output))) (rule - (targets unary.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to unary.ml.output (run %{bin:ocamlformat} %{dep:unary.ml})))) (rule @@ -2413,10 +2198,9 @@ (action (diff unary.ml.ref unary.ml.output))) (rule - (targets unicode.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to unicode.ml.output (run %{bin:ocamlformat} --margin=80 --wrap-comments %{dep:unicode.ml})))) (rule @@ -2424,10 +2208,9 @@ (action (diff unicode.ml.ref unicode.ml.output))) (rule - (targets use_file.mlt.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to use_file.mlt.output (run %{bin:ocamlformat} %{dep:use_file.mlt})))) (rule @@ -2435,10 +2218,9 @@ (action (diff use_file.mlt use_file.mlt.output))) (rule - (targets verbose1.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to verbose1.ml.output (run %{bin:ocamlformat} --print-config --doc-comments=before --config=doc-comments=before %{dep:verbose1.ml})))) (rule @@ -2446,10 +2228,9 @@ (action (diff verbose1.ml.ref verbose1.ml.output))) (rule - (targets verbose2.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to verbose2.ml.output (run %{bin:ocamlformat} --print-config --doc-comments=before --config=doc-comments=before %{dep:verbose2.ml})))) (rule @@ -2457,10 +2238,9 @@ (action (diff verbose2.ml.ref verbose2.ml.output))) (rule - (targets wrap_comments.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to wrap_comments.ml.output (run %{bin:ocamlformat} --profile=ocamlformat %{dep:wrap_comments.ml})))) (rule @@ -2468,10 +2248,9 @@ (action (diff wrap_comments.ml.ref wrap_comments.ml.output))) (rule - (targets wrap_comments_break.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to wrap_comments_break.ml.output (run %{bin:ocamlformat} --no-wrap-fun-args --margin=67 %{dep:wrap_comments_break.ml})))) (rule @@ -2479,10 +2258,9 @@ (action (diff wrap_comments_break.ml wrap_comments_break.ml.output))) (rule - (targets wrapping_functor_args.ml.output) (deps .ocamlformat ) (action - (with-outputs-to %{targets} + (with-outputs-to wrapping_functor_args.ml.output (run %{bin:ocamlformat} %{dep:wrapping_functor_args.ml})))) (rule diff --git a/test/passing/gen/gen.ml b/test/passing/gen/gen.ml index 1220d26e9a..2de72cf62e 100644 --- a/test/passing/gen/gen.ml +++ b/test/passing/gen/gen.ml @@ -83,17 +83,16 @@ let emit_test test_name setup = Printf.printf {| (rule - (targets %s.output) (deps .ocamlformat %s) (action - (with-outputs-to %%{targets} + (with-outputs-to %s.output %s))) (rule (alias runtest)%s (action (diff %s %s.output))) |} - test_name extra_deps + extra_deps test_name (cmd setup.should_fail ( ["%{bin:ocamlformat}"] @ opts @ [Printf.sprintf "%%{dep:%s}" base_test_name] )) @@ -102,17 +101,16 @@ let emit_test test_name setup = Printf.printf {| (rule - (targets %s.ocp.output) (deps .ocp-indent %s) (action - (with-outputs-to %%{targets} + (with-outputs-to %s.ocp.output %s))) (rule (alias runtest) (action (diff %s.ocp %s.ocp.output))) |} - test_name extra_deps + extra_deps test_name (cmd setup.should_fail ["%{bin:ocp-indent}"; Printf.sprintf "%%{dep:%s}" ref_name]) test_name test_name diff --git a/test/projects/dune b/test/projects/dune index 4d7cb8b745..27d0eb8aac 100644 --- a/test/projects/dune +++ b/test/projects/dune @@ -1,10 +1,9 @@ (rule - (targets enable_outside_detected_project.output) (deps enable_outside_detected_project/dune-project enable_outside_detected_project/main.ml .ocamlformat) (action (with-stdout-to - %{targets} + enable_outside_detected_project.output (chdir enable_outside_detected_project (run ocamlformat --enable-outside-detected-project main.ml))))) @@ -16,12 +15,10 @@ enable_outside_detected_project.output))) (rule - (targets outside_detected_project.output) - (deps outside_detected_project/dune-project outside_detected_project/main.ml - .ocamlformat) + (deps outside_detected_project/dune-project outside_detected_project/main.ml) (action (with-outputs-to - %{targets} + outside_detected_project.output (chdir outside_detected_project (run ocamlformat main.ml))))) @@ -32,12 +29,11 @@ (diff outside_detected_project.expected outside_detected_project.output))) (rule - (targets outside_detected_project_with_name.output) (deps (source_tree outside_detected_project_with_name)) (action (with-outputs-to - %{targets} + outside_detected_project_with_name.output (chdir outside_detected_project_with_name/project_root (run ocamlformat --name a.ml ../outside_root/a.ml)))))