Deduplicate solver errors when generating portable lockdirs #12642
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Alizter
reviewed
Oct 28, 2025
bin/pkg/lock.ml
Outdated
| Platforms_by_message.to_list platforms_by_message | ||
| |> List.map ~f:(fun (solver_error, platforms) -> | ||
| Pp.concat | ||
| ~sep:Pp.newline |
Collaborator
There was a problem hiding this comment.
Don't use Pp.newline as it messes up various things that consume user messages. Instead do a break and wrap in a vertical box. You can also use Pp.concat_map with a hovbox so that each line sits sensibly.
Alizter
reviewed
Oct 28, 2025
bin/pkg/lock.ml
Outdated
| @@ Pp.textf | ||
| "Unable to solve dependencies while generating lock directory: %s" | ||
| (Path.to_string_maybe_quoted path) | ||
| ; Pp.hovbox (Pp.concat ~sep:Pp.newline (pp_solve_errors_by_platforms errors)) |
Collaborator
There was a problem hiding this comment.
Same comment about Pp.newline even though it was around before.
Alizter
reviewed
Oct 28, 2025
bin/pkg/lock.ml
Outdated
| @ List.concat_map errors ~f:(fun (path, errors) -> | ||
| let messages = Platforms_by_message.all_messages errors in | ||
| [ Pp.textf "Lock directory %s:" (Path.to_string_maybe_quoted path) | ||
| ; Pp.hovbox (Pp.concat ~sep:Pp.newline messages) |
ElectreAAS
reviewed
Oct 28, 2025
test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-no-solution.t
Show resolved
Hide resolved
ElectreAAS
reviewed
Oct 28, 2025
test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-partial-solve.t
Show resolved
Hide resolved
gridbugs
force-pushed
the
portable-lockdirs-dedup-errors
branch
2 times, most recently
from
07870ae to
09e28a2
Compare
ElectreAAS
approved these changes
Oct 29, 2025
Alizter
approved these changes
Oct 29, 2025
When generating portable lockdirs the solver runs multiple times. Dune collects any errors from the solver and prints them to the terminal in the event that no solution was found on any platforms, and logs them printing a warning if no solution was found on some but not all platforms. This can create a situation where the same error is printed multiple times, since many solver errors are platform agnostic. This change groups solver errors by the contents of their message when generating portable lockdirs. Each solver error is printed a single time, along with the list of platforms on which it occurred. Signed-off-by: Stephen Sherratt <stephen@sherra.tt>
Alizter
force-pushed
the
portable-lockdirs-dedup-errors
branch
from
09e28a2 to
25af255
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When generating portable lockdirs the solver runs multiple times. Dune collects any errors from the solver and prints them to the terminal in the event that no solution was found on any platforms, and logs them printing a warning if no solution was found on some but not all platforms. This can create a situation where the same error is printed multiple times, since many solver errors are platform agnostic.
This change groups solver errors by the contents of their message when generating portable lockdirs. Each solver error is printed a single time, along with the list of platforms on which it occurred.