Skip to content

Commit

Permalink
_
Browse files Browse the repository at this point in the history
Signed-off-by: Rudi Grinberg <[email protected]>
  • Loading branch information
rgrinberg authored and jonludlam committed Oct 6, 2023
1 parent 4d5ce6c commit 879db71
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions src/dune_rules/odoc_new.ml
Original file line number Diff line number Diff line change
Expand Up @@ -405,18 +405,20 @@ module Valid = struct
let scope = find proj in
Scope.libs scope
in
let+ libs = Lib.DB.all lib_db in
let libs =
match mask with
| None -> libs
| Some mask ->
Lib.Set.filter libs ~f:(fun lib ->
let info = Lib.info lib in
match Lib_info.package info with
| Some p -> List.mem ~equal:Package.Name.equal mask p
| None -> false)
let+ libs_acc =
let+ libs = Lib.DB.all lib_db in
let libs =
match mask with
| None -> libs
| Some mask ->
Lib.Set.filter libs ~f:(fun lib ->
let info = Lib.info lib in
match Lib_info.package info with
| Some p -> List.mem ~equal:Package.Name.equal mask p
| None -> false)
in
(proj, lib_db, libs) :: libs_acc
in
let libs_acc = (proj, lib_db, libs) :: libs_acc in
let pkg_acc =
let pkgs =
let proj_pkgs = Dune_project.packages proj |> Package.Name.Map.keys in
Expand All @@ -437,8 +439,10 @@ module Valid = struct
Memo.parallel_map libs ~f:(fun (_, _lib_db, libs) ->
Lib.Set.fold ~init:(Memo.return []) libs ~f:(fun lib acc ->
let* acc = acc in
let* libs = Lib.closure (lib :: Option.to_list stdlib) ~linking:false in
let+ libs = Resolve.read_memo libs in
let+ libs =
let* libs = Lib.closure (lib :: Option.to_list stdlib) ~linking:false in
Resolve.read_memo libs
in
libs :: acc))
in
List.concat libs_list
Expand Down

0 comments on commit 879db71

Please sign in to comment.