Fix order-dependent visibility diagnostics#155948
Open
SynapLink wants to merge 1 commit intorust-lang:mainfrom
Open
Fix order-dependent visibility diagnostics#155948SynapLink wants to merge 1 commit intorust-lang:mainfrom
SynapLink wants to merge 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
SynapLink
force-pushed
the
fix/pub-visibility-order
branch
from
bfb4b8a to
21b1458
Compare
rustbot
added
the
S-waiting-on-review
rustbot
removed
the
S-waiting-on-author
Collaborator
|
r? @mu001999 rustbot has assigned @mu001999. Use Why was this reviewer chosen?The reviewer was selected based on:
|
petrochenkov
added
S-waiting-on-author
SynapLink
force-pushed
the
fix/pub-visibility-order
branch
from
21b1458 to
4f56ffe
Compare
Contributor
Author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
mu001999
reviewed
Apr 30, 2026
SynapLink
force-pushed
the
fix/pub-visibility-order
branch
from
4f56ffe to
843b87b
Compare
|
|
||
| fn report_delayed_vis_resolution_errors(&mut self) { | ||
| for DelayedVisResolutionError { vis, parent_scope, error } in | ||
| std::mem::take(&mut self.delayed_vis_resolution_errors) |
Contributor
There was a problem hiding this comment.
Suggested change
| std::mem::take(&mut self.delayed_vis_resolution_errors) | |
| mem::take(&mut self.delayed_vis_resolution_errors) |
Nit: proper importing.
| std::mem::take(&mut self.delayed_vis_resolution_errors) | ||
| { | ||
| match self.try_resolve_visibility(parent_scope, &vis, VisResolutionMode::Finalize) { | ||
| Ok(_) => { |
Contributor
There was a problem hiding this comment.
Suggested change
| Ok(_) => { | |
| Ok(_) => self.report_vis_error(error), |
Nit: shorter formatting.
| Res::Def(self.r.tcx.def_kind(def_id), def_id) | ||
| } | ||
| impl<'ra, 'tcx> Resolver<'ra, 'tcx> { | ||
| fn visibility_path_segments( |
Contributor
There was a problem hiding this comment.
This method is no longer necessary, could you inline it back to its place?
| } | ||
|
|
||
| fn try_resolve_visibility<'ast>( | ||
| pub(crate) fn try_resolve_visibility( |
Contributor
There was a problem hiding this comment.
There's an existing impl<'ra, 'tcx> Resolver<'ra, 'tcx> { ... } block above, you could put this function there.
| finalize: bool, | ||
| ) -> Result<Visibility, VisResolutionError<'ast>> { | ||
| let parent_scope = &self.parent_scope; | ||
| parent_scope: ParentScope<'ra>, |
Contributor
There was a problem hiding this comment.
Suggested change
| parent_scope: ParentScope<'ra>, | |
| parent_scope: &ParentScope<'ra>, |
| if finalize { | ||
| self.r.record_partial_res(id, PartialRes::new(res)); | ||
| if matches!(mode, VisResolutionMode::FinalizeAndRecord) { | ||
| self.record_partial_res(id, PartialRes::new(res)); |
Contributor
There was a problem hiding this comment.
Was VisResolutionMode introduced to avoid calling record_partial_res twice?
I don't think we need it, it would be better to call record_partial_res only if we are returning Ok instead.
petrochenkov
added
S-waiting-on-author
SynapLink
force-pushed
the
fix/pub-visibility-order
branch
from
843b87b to
f7c62f5
Compare
Contributor
Author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
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
5 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 #40066.
Fixes #109657.
Delay visibility path diagnostics until module collection has finished, so paths to later non-ancestor modules report E0742 instead of an unresolved path error.