fix(melange): account for preprocessing when getting library's Modules.t during emission#10297
Merged
anmonteiro merged 4 commits intoocaml:mainfrom Mar 22, 2024
Conversation
8a5b9f9 to
0d4c945
Compare
0d4c945 to
18fc55a
Compare
Ocamldep.read_immediate_deps_of
0003a37 to
1fa5da7
Compare
Ocamldep.read_immediate_deps_ofOcamldep.read_immediate_deps_of
986a7ca to
5791466
Compare
…result Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
5791466 to
6715575
Compare
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
6715575 to
a5b6c5a
Compare
Collaborator
Author
|
I tested this in a real world project impacted by the regression and it fixed the issue too. |
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
c26c83f to
70c757d
Compare
Ocamldep.read_immediate_deps_of
jchavarri
approved these changes
Mar 22, 2024
pmwhite
pushed a commit
to pmwhite/dune
that referenced
this pull request
Apr 2, 2024
…s.t during emission (ocaml#10297) * test: show melange.emit regression attempting to read wrong ocamldep result Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com> * fix: read the processed file in Ocamldep.read_immediate_deps_of Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com> * fix(virtual_lib_compilation_test): only add dependency if impl exists Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com> --------- Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
.cmjdeps as dependencies of JS rules #10286, caused by readingimmediate_deps_ofthe current cmj fileOcamldep.read_immediate_deps_ofneeds to account for the fact that the file may have been pre-processed by a dialect, and use the final filename instead.Modules.tstructure where we consult.impl.dfilesthe error can be seen in the first commit: