Skip to content

Simplify Pkg_rules.source_files a bit #14301

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

Merged
Alizter merged 1 commit into from
Apr 24, 2026
+5 −9
Merged

Simplify Pkg_rules.source_files a bit #14301

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
14 changes: 5 additions & 9 deletions src/dune_rules/pkg_rules.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,18 +498,14 @@ module Pkg = struct
let contents = Fs_memo.Dir_contents.to_list contents in
List.rev_filter_partition_map contents ~f:(fun (name, kind) ->
(* TODO handle links and cycles correctly *)
let relative = Path.Local.relative path name in
match kind with
| S_DIR -> if skip_dir name then Skip else Right name
| _ -> if skip_file name then Skip else Left name)
in
let acc =
Path.Local.Set.of_list_map files ~f:(Path.Local.relative path)
|> Path.Local.Set.union acc
| S_DIR -> if skip_dir name then Skip else Right relative
Copy link
Copy Markdown
Collaborator

@Alizter Alizter Apr 23, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this if needs to be pulled out above the let releative. We always consider skipping, but we don't always need to construct relatative.

Copy link
Copy Markdown
Collaborator Author

@ElectreAAS ElectreAAS Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean something like this:

List.rev... ->
match kind with
| S_DIR -> if skip_dir name then Skip else Right (Path.Local.relative path name)
| _ -> if skip_file name then Skip else Left (Path.Local.relative path name))

It'd go against the idea of not repeating the relative call, for what I perceive to be minimal benefit

Did you miss that skip_dir and skip_file are different functions?

Copy link
Copy Markdown
Collaborator

@Alizter Alizter Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's true, my bad.

| _ -> if skip_file name then Skip else Left relative)
in
let acc = Path.Local.Set.of_list files |> Path.Local.Set.union acc in
let+ dirs =
Memo.parallel_map dirs ~f:(fun dir ->
let dir = Path.Local.relative path dir in
loop root Path.Local.Set.empty dir)
Memo.parallel_map dirs ~f:(fun dir -> loop root Path.Local.Set.empty dir)
in
Path.Local.Set.union_all (acc :: dirs)
in
Expand Down
Loading