Fix: Handle block exprs as modules when finding their parents #18206
Conversation
This file contains 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
rustbot
added
the
S-waiting-on-review
ShoyuVanilla
commented
Sep 29, 2024
| container | ||
| .unwrap_or(*def) | ||
| .module(db) | ||
| .map(|module| path(db, module, definition_owner_name(db, def, edition), edition)) |
There was a problem hiding this comment.
We currently have another bug like in;
So, check for the path of the assoc item container instead of def iteslf whenever def is an assoc item
ShoyuVanilla
commented
Sep 29, 2024
| .filter(|m| !matches!(m.definition_source(db).value, ModuleSource::BlockExpr(_))) | ||
| .count() | ||
| // exclude `m` itself | ||
| .saturating_sub(1); |
There was a problem hiding this comment.
This is a bit awkward but we need to substract one when m itself is a block expr module
|
☔ The latest upstream changes (presumably #18205) made this pull request unmergeable. Please resolve the merge conflicts. |
Veykril
approved these changes
Sep 30, 2024
|
@bors delegate+ |
|
✌️ @ShoyuVanilla, you can now approve this pull request! If @Veykril told you to " |
ShoyuVanilla
force-pushed
the
issue-18187
branch
from
2d45444
to
e09c2a0
Compare
|
☀️ Test successful - checks-actions |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #18187