Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove various helper functions from Action_builder modules #9132

Closed
wants to merge 10 commits into from
3 changes: 2 additions & 1 deletion bin/alias.ml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ let dep_on_alias_multi_contexts ~dir ~name ~contexts =
let context_to_alias_expansion ctx =
let ctx_dir = Context_name.build_dir ctx in
let dir = Path.Build.(append_source ctx_dir dir) in
Action_builder.alias (Alias.make ~dir name)
Build_system.record_deps
(Dep.Set.singleton (Dep.alias (Dune_engine.Alias.make ~dir name)))
in
Action_builder.all_unit (List.map contexts ~f:context_to_alias_expansion)
;;
Expand Down
4 changes: 3 additions & 1 deletion bin/build_cmd.ml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ let run_build_system ~common ~request =
let toplevel_cell, toplevel =
Memo.Lazy.Expert.create ~name:"toplevel" (fun () ->
let open Memo.O in
let+ (), (_ : Dep.Fact.t Dep.Map.t) = Action_builder.run request Eager in
let+ (), (_ : Dep.Facts.t) =
Action_builder.evaluate_and_collect_facts request
in
())
in
let* res = run ~toplevel in
Expand Down
2 changes: 1 addition & 1 deletion bin/target.ml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ let request targets =
acc
>>>
match (target : Request.t) with
| File path -> Action_builder.path path
| File path -> Build_system.record_deps (Dep.Set.singleton (Dep.file path))
| Alias a -> Alias.request a)
;;

Expand Down
Loading
Loading