Skip to content

refactor(sites): share public library lookup #70

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.

Sign up for GitHub

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

Draft
anmonteiro wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor(sites): share public library lookup #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions src/dune_rules/sites/plugin_rules.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@ let resolve_libs t public_libs =
Resolve.Memo.List.map t.libraries ~f:(Lib.DB.resolve public_libs)
;;

let public_libs sctx = Super_context.context sctx |> Context.name |> Scope.DB.public_libs

let setup_rules ~sctx ~dir t =
(let open Action_builder.O in
let* public_libs =
Super_context.context sctx
|> Context.name
|> Scope.DB.public_libs
|> Action_builder.of_memo
in
let* public_libs = Action_builder.of_memo (public_libs sctx) in
Resolve.Memo.read
@@
let open Resolve.Memo.O in
Expand All @@ -42,9 +39,7 @@ let setup_rules ~sctx ~dir t =

let install_rules ~sctx ~package_db ~dir ({ name; site = loc, (pkg, site); _ } as t) =
let* skip_files =
let* public_libs =
Super_context.context sctx |> Context.name |> Scope.DB.public_libs
in
let* public_libs = public_libs sctx in
if t.optional
then Resolve.Memo.is_error (resolve_libs t public_libs)
else Memo.return false
Expand Down
Loading