Fix difference between bootstrap & dune behaviour w.r.t include-subdirs ambiguity #12587
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 17, 2025
test/blackbox-tests/test-cases/boot/include-subdirs-qualified-ambiguous.t
Outdated
Show resolved
Hide resolved
Alizter
reviewed
Oct 17, 2025
test/blackbox-tests/test-cases/include-qualified/ambiguous-module-name.t
Outdated
Show resolved
Hide resolved
Alizter
force-pushed
the
repro-include-subdir-bug
branch
2 times, most recently
from
5380d48 to
36b4592
Compare
|
I've pushed a fix for this. It involves reversing the order of the parents we collect for a module. This meant however I had to reverse the order of the place we generate deps, but it seems to have resolved things for the better. |
ElectreAAS
changed the title
Alizter
force-pushed
the
repro-include-subdir-bug
branch
from
008438e to
a3d03d9
Compare
rgrinberg
approved these changes
Oct 17, 2025
|
Rebasing #12585 on top of this shows that this isn't a complete fix. |
|
Specifically this won't fix all the issues encountered in #12585, but it will fix this one. |
…-subdirs Signed-off-by: Ambre Austen Suhamy <[email protected]>
Co-authored-by: Ambre Austen Suhamy <[email protected]> Signed-off-by: Ali Caglayan <[email protected]>
Alizter
force-pushed
the
repro-include-subdir-bug
branch
from
a3d03d9 to
5505247
Compare
This was referenced Oct 21, 2025
Merged
Alizter
added a commit
to Alizter/dune
that referenced
this pull request
Oct 23, 2025
Signed-off-by: Ali Caglayan <[email protected]>
shonfeder
pushed a commit
that referenced
this pull request
Oct 23, 2025
Signed-off-by: Ali Caglayan <[email protected]>
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.
Initial problem
When we have 2 modules with the same name, the one that is closer should be picked up.
The behaviour is correct within the bootstrapped dune, but not normal dune.
In bin,
include_subdirs qualifiedwas introduced in #12478.Working on #12585, we realized there was a bug.
Fix
In 36b4592, Ali fixed the bug!