Fix path resolution for child mods of those expanded by include!
#17650
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.
Child modules wouldn't use the correct candidate paths due to a branch that doesn't seem to be doing what it's intended to do. Removing the branch fixes the problem and all existing test cases pass.
Having no knowledge of how any of this works, I believe this fixes #17645. Using another test that writes the included mod directly into
lib.rs
instead, I found the difference can be traced to the candidate files we use to look up mods. A separate branch for if the file comes from aninclude!
macro doesn't take into account the original mod we're contained within:I'm not sure why this branch exists. Tracing the branch back takes us to 3bb9efb but it doesn't say why the branch was added. The test case that was added in this commit passes with the branch removed, so I think it's just superfluous at this point.