mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

privacy: Rename some variables for clarity

Browse Source
This commit is contained in:
Vadim Petrochenkov 2023-06-15 20:43:20 +03:00
parent 95a24c6ed4
commit 98a86ffc9f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_middle/src/middle/privacy.rs
View File

@ -215,7 +215,7 @@ impl<Id: Eq + Hash> EffectiveVisibilities<Id> {
pub fn update( pub fn update(
&mut self, &mut self,
id: Id, id: Id,
nominal_vis: Option<Visibility>, max_vis: Option<Visibility>,
lazy_private_vis: impl FnOnce() -> Visibility, lazy_private_vis: impl FnOnce() -> Visibility,
inherited_effective_vis: EffectiveVisibility, inherited_effective_vis: EffectiveVisibility,
level: Level, level: Level,
@ -239,8 +239,8 @@ impl<Id: Eq + Hash> EffectiveVisibilities<Id> {
if !(inherited_effective_vis_at_prev_level == inherited_effective_vis_at_level if !(inherited_effective_vis_at_prev_level == inherited_effective_vis_at_level
&& level != l) && level != l)
{ {
calculated_effective_vis = if let Some(nominal_vis) = nominal_vis && !nominal_vis.is_at_least(inherited_effective_vis_at_level, tcx) { calculated_effective_vis = if let Some(max_vis) = max_vis && !max_vis.is_at_least(inherited_effective_vis_at_level, tcx) {
nominal_vis max_vis
} else { } else {
inherited_effective_vis_at_level inherited_effective_vis_at_level
} }

14
compiler/rustc_privacy/src/lib.rs
View File

@ -473,14 +473,14 @@ impl<'tcx> EmbargoVisitor<'tcx> {
&mut self, &mut self,
def_id: LocalDefId, def_id: LocalDefId,
inherited_effective_vis: EffectiveVisibility, inherited_effective_vis: EffectiveVisibility,
nominal_vis: Option<ty::Visibility>, max_vis: Option<ty::Visibility>,
level: Level, level: Level,
) { ) {
let private_vis = ty::Visibility::Restricted(self.tcx.parent_module_from_def_id(def_id)); let private_vis = ty::Visibility::Restricted(self.tcx.parent_module_from_def_id(def_id));
if Some(private_vis) != nominal_vis { if max_vis != Some(private_vis) {
self.changed |= self.effective_visibilities.update( self.changed |= self.effective_visibilities.update(
def_id, def_id,
nominal_vis, max_vis,
|| private_vis, || private_vis,
inherited_effective_vis, inherited_effective_vis,
level, level,
@ -774,9 +774,9 @@ impl<'tcx> Visitor<'tcx> for EmbargoVisitor<'tcx> {
for impl_item_ref in impl_.items { for impl_item_ref in impl_.items {
let def_id = impl_item_ref.id.owner_id.def_id; let def_id = impl_item_ref.id.owner_id.def_id;
let nominal_vis = let max_vis =
impl_.of_trait.is_none().then(|| self.tcx.local_visibility(def_id)); impl_.of_trait.is_none().then(|| self.tcx.local_visibility(def_id));
self.update_eff_vis(def_id, item_ev, nominal_vis, Level::Direct); self.update_eff_vis(def_id, item_ev, max_vis, Level::Direct);
if let Some(impl_item_ev) = self.get(def_id) { if let Some(impl_item_ev) = self.get(def_id) {
self.reach(def_id, impl_item_ev).generics().predicates().ty(); self.reach(def_id, impl_item_ev).generics().predicates().ty();
@ -897,9 +897,9 @@ impl<'tcx> DefIdVisitor<'tcx> for ReachEverythingInTheInterfaceVisitor<'_, 'tcx>
// All effective visibilities except `reachable_through_impl_trait` are limited to // All effective visibilities except `reachable_through_impl_trait` are limited to
// nominal visibility. If any type or trait is leaked farther than that, it will // nominal visibility. If any type or trait is leaked farther than that, it will
// produce type privacy errors on any use, so we don't consider it leaked. // produce type privacy errors on any use, so we don't consider it leaked.
let nominal_vis = (self.level != Level::ReachableThroughImplTrait) let max_vis = (self.level != Level::ReachableThroughImplTrait)
.then(|| self.ev.tcx.local_visibility(def_id)); .then(|| self.ev.tcx.local_visibility(def_id));
self.ev.update_eff_vis(def_id, self.effective_vis, nominal_vis, self.level); self.ev.update_eff_vis(def_id, self.effective_vis, max_vis, self.level);
} }
ControlFlow::Continue(()) ControlFlow::Continue(())
} }