From 6e59fb27ff4f6098b03a96644e6572fb42f4cc8a Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 21 Sep 2023 18:40:19 +0100 Subject: [PATCH] refactor: simplify left over type signature Signed-off-by: Rudi Grinberg --- src/dune_rules/simple_rules.ml | 4 ++-- src/dune_rules/super_context.ml | 2 +- src/dune_rules/super_context.mli | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dune_rules/simple_rules.ml b/src/dune_rules/simple_rules.ml index e52650ab438..b0b19eef240 100644 --- a/src/dune_rules/simple_rules.ml +++ b/src/dune_rules/simple_rules.ml @@ -134,7 +134,7 @@ let user_rule sctx ?extra_bindings ~dir ~expander (rule : Rule.t) = else action in (match rule_kind ~rule ~action with - | No_alias -> add_user_rule sctx ~dir ~rule ~action ~expander + | No_alias -> add_user_rule sctx ~dir ~rule ~action ~expander >>| Option.some | Aliases_with_targets (aliases, alias_target) -> let* () = let aliases = List.map ~f:(Alias.make ~dir) aliases in @@ -143,7 +143,7 @@ let user_rule sctx ?extra_bindings ~dir ~expander (rule : Rule.t) = alias (Action_builder.path (Path.build alias_target))) in - add_user_rule sctx ~dir ~rule ~action ~expander + add_user_rule sctx ~dir ~rule ~action ~expander >>| Option.some | Aliases_only aliases -> let aliases = List.map ~f:(Alias.make ~dir) aliases in let* action = interpret_and_add_locks ~expander rule.locks action.build in diff --git a/src/dune_rules/super_context.ml b/src/dune_rules/super_context.ml index 5fcd152df5f..9aa5d8cdee2 100644 --- a/src/dune_rules/super_context.ml +++ b/src/dune_rules/super_context.ml @@ -281,7 +281,7 @@ let add_rule t ?mode ?loc ~dir build = let add_rule_get_targets t ?mode ?loc ~dir build = let rule = make_rule t ?mode ?loc ~dir build in let+ () = Rules.Produce.rule rule in - Some rule.targets + rule.targets ;; let add_rules t ?loc ~dir builds = Memo.parallel_iter builds ~f:(add_rule ?loc t ~dir) diff --git a/src/dune_rules/super_context.mli b/src/dune_rules/super_context.mli index 7e11c9b5db1..b4fe34bbcba 100644 --- a/src/dune_rules/super_context.mli +++ b/src/dune_rules/super_context.mli @@ -47,7 +47,7 @@ val add_rule_get_targets -> ?loc:Loc.t -> dir:Path.Build.t -> Action.Full.t Action_builder.With_targets.t - -> Targets.Validated.t option Memo.t + -> Targets.Validated.t Memo.t val add_rules : t