Fix invalid suggestions and misleading notes for imports - #162688
Open
chenyukang wants to merge 2 commits into
Open
chenyukang wants to merge 2 commits into
chenyukang wants to merge 2 commits into
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
rustbot has assigned @petrochenkov. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Contributor
|
@rustbot reroll |
This comment has been minimized.
This comment has been minimized.
mu001999
reviewed
Sep 17, 2026
rustbot
added
S-waiting-on-author
chenyukang
force-pushed
the
yukang-fix-149418-private-import-alias-suggestion-2
branch
from
September 20, 2026 23:14
58482ba to
73601a2
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
mu001999
reviewed
Sep 22, 2026
| let mut next_binding = Some((decl, false)); | ||
| let mut next_ident = ident; | ||
| while let Some(binding) = next_binding { | ||
| while let Some((binding, path_to_binding_accessible)) = next_binding { |
Member
There was a problem hiding this comment.
What I have in mind is like, to reduce the nesting depth and help reading code:
while let Some((binding, path_to_binding_accessible)) = next_binding.take() {
...
if res != Res::Err
&& let DeclKind::Import { source_decl, import, .. } = binding.kind
&& !source_decl.span.is_dummy()
&& let Some(source) = match import.kind {
ImportKind::Single { source, .. } => Some(source),
ImportKind::Glob { .. }
| ImportKind::MacroUse { .. }
| ImportKind::MacroExport => Some(next_ident),
ImportKind::ExternCrate { .. } => None,
}
{
...
next_ident = source;
next_binding = Some((source_decl, path_is_accessible));
}| segments: import | ||
| .module_path | ||
| .iter() | ||
| .filter(|segment| segment.ident.name != kw::PathRoot) |
Member
There was a problem hiding this comment.
Suggested change
| .filter(|segment| segment.ident.name != kw::PathRoot) | |
| .filter(|segment| { | |
| segment.ident.name != kw::PathRoot || segment.ident.span.at_least_rust_2018() | |
| }) |
| source_res, | ||
| &parent_scope, | ||
| ) { | ||
| path_is_accessible = true; |
Member
There was a problem hiding this comment.
import_source_suggestion_path only checks the Res. So if the path points to the different source_decl in parent_scope, we shouldn't label this import with you could import this re-export, right?
Maybe we should also check that this path would point to the same source_decl.
| let resolves_to_source = | ||
| match self.cm().maybe_resolve_path(&segments, source_res.ns(), parent_scope, None) { | ||
| PathResult::NonModule(partial_res) => partial_res.full_res() == Some(source_res), | ||
| PathResult::Module(ModuleOrUniformRoot::Module(module)) => { |
Member
There was a problem hiding this comment.
I think it is fine to include ModuleAndExternPrelude here
Suggested change
| PathResult::Module(ModuleOrUniformRoot::Module(module)) => { | |
| PathResult::Module( | |
| ModuleOrUniformRoot::Module(module) | |
| | ModuleOrUniformRoot::ModuleAndExternPrelude(module), | |
| ) => module.res() == Some(source_res), |
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
4 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.
Fixes #149418
It's better to review by commits.
The first commit is adding test.
The second commit is trying to fix the original issue in #149418.
The last commit fix a seperated accessibility issue by the way.