Skip to content

privacy: share effective visibility initialization #155794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Apr 30, 2026
+2 −8
Merged

privacy: share effective visibility initialization #155794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions compiler/rustc_middle/src/middle/privacy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,11 @@ impl<Id: Eq + Hash> EffectiveVisibilities<Id> {
self.map.get(&id)
}

// FIXME: Share code with `fn update`.
pub fn effective_vis_or_private(
&mut self,
id: Id,
lazy_private_vis: impl FnOnce() -> Visibility,
) -> &EffectiveVisibility {
) -> &mut EffectiveVisibility {
self.map.entry(id).or_insert_with(|| EffectiveVisibility::from_vis(lazy_private_vis()))
}

Expand All @@ -226,11 +225,7 @@ impl<Id: Eq + Hash> EffectiveVisibilities<Id> {
tcx: TyCtxt<'_>,
) -> bool {
let mut changed = false;
let mut current_effective_vis = self
.map
.get(&id)
.copied()
.unwrap_or_else(|| EffectiveVisibility::from_vis(lazy_private_vis()));
let current_effective_vis = self.effective_vis_or_private(id, lazy_private_vis);

let mut inherited_effective_vis_at_prev_level = *inherited_effective_vis.at_level(level);
let mut calculated_effective_vis = inherited_effective_vis_at_prev_level;
Expand Down Expand Up @@ -268,7 +263,6 @@ impl<Id: Eq + Hash> EffectiveVisibilities<Id> {
}
}

self.map.insert(id, current_effective_vis);
changed
}
}
Expand Down
Loading