Correct the paths of submodules from the include! macro #8134
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
Signed-off-by: Yilin Chen <sticnarf@gmail.com>
sticnarf
force-pushed
the
include-child-mod
branch
from
d9c34b9 to
3bb9efb
Compare
edwin0cheng
reviewed
Mar 21, 2021
Contributor
edwin0cheng
left a comment
edwin0cheng
left a comment
There was a problem hiding this comment.
LGTM except a little nit
| None => { | ||
| candidate_files.push(format!("{}{}.rs", self.dir_path.0, name)); | ||
| candidate_files.push(format!("{}{}/mod.rs", self.dir_path.0, name)); | ||
| if is_include_macro { |
Contributor
There was a problem hiding this comment.
Is is possible to move file_id.is_include_macro(db.upcast()); inside here , such that :
if file_id.is_include_macro(db.upcast()) {
Contributor
Author
There was a problem hiding this comment.
Ok, I moved it inside.
Signed-off-by: Yilin Chen <sticnarf@gmail.com>
Contributor
|
Thanks a lot ! bors r+ |
Contributor
Member
|
changelog fix (first contribution) fix module resolution in |
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.
This PR should fix #7846. It mostly follows the instructions from @edwin0cheng in that issue.