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

rustc_privacy: Merge three matches on ItemKind into one

Browse Source 
and remove some more `Option`s as a result
This commit is contained in:
Vadim Petrochenkov 2023-05-05 19:33:02 +03:00
parent d831141638
commit e41c422dff
1 changed files with 63 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,7 +474,7 @@ fn get(&self, def_id: LocalDefId) -> Option<EffectiveVisibility> {
fn update( fn update(
&mut self, &mut self,
def_id: LocalDefId, def_id: LocalDefId,
inherited_effective_vis: Option<EffectiveVisibility>, inherited_effective_vis: EffectiveVisibility,
level: Level, level: Level,
) { ) {
let nominal_vis = self.tcx.local_visibility(def_id); let nominal_vis = self.tcx.local_visibility(def_id);
@ -484,23 +484,20 @@ fn update(
fn update_eff_vis( fn update_eff_vis(
&mut self, &mut self,
def_id: LocalDefId, def_id: LocalDefId,
inherited_effective_vis: Option<EffectiveVisibility>, inherited_effective_vis: EffectiveVisibility,
nominal_vis: Option<ty::Visibility>, nominal_vis: Option<ty::Visibility>,
level: Level, level: Level,
) { ) {
if let Some(inherited_effective_vis) = inherited_effective_vis { let private_vis = ty::Visibility::Restricted(self.tcx.parent_module_from_def_id(def_id));
let private_vis = if Some(private_vis) != nominal_vis {
ty::Visibility::Restricted(self.tcx.parent_module_from_def_id(def_id)); self.changed |= self.effective_visibilities.update(
if Some(private_vis) != nominal_vis { def_id,
self.changed |= self.effective_visibilities.update( nominal_vis,
def_id, || private_vis,
nominal_vis, inherited_effective_vis,
|| private_vis, level,
inherited_effective_vis, self.tcx,
level, );
self.tcx,
);
}
} }
} }
@ -532,9 +529,13 @@ fn reach_through_impl_trait(
// We have to make sure that the items that macros might reference // We have to make sure that the items that macros might reference
// are reachable, since they might be exported transitively. // are reachable, since they might be exported transitively.
fn update_reachability_from_macro(&mut self, local_def_id: LocalDefId, md: &MacroDef) { fn update_reachability_from_macro(
&mut self,
local_def_id: LocalDefId,
md: &MacroDef,
macro_ev: EffectiveVisibility,
) {
// Non-opaque macros cannot make other items more accessible than they already are. // Non-opaque macros cannot make other items more accessible than they already are.
let hir_id = self.tcx.hir().local_def_id_to_hir_id(local_def_id); let hir_id = self.tcx.hir().local_def_id_to_hir_id(local_def_id);
let attrs = self.tcx.hir().attrs(hir_id); let attrs = self.tcx.hir().attrs(hir_id);
if attr::find_transparency(attrs, md.macro_rules).0 != Transparency::Opaque { if attr::find_transparency(attrs, md.macro_rules).0 != Transparency::Opaque {
@ -554,8 +555,6 @@ fn update_reachability_from_macro(&mut self, local_def_id: LocalDefId, md: &Macr
// Since we are starting from an externally visible module, // Since we are starting from an externally visible module,
// all the parents in the loop below are also guaranteed to be modules. // all the parents in the loop below are also guaranteed to be modules.
let mut module_def_id = macro_module_def_id; let mut module_def_id = macro_module_def_id;
// If the macro eff vis is not in the table the condition above will return.
let macro_ev = self.get(local_def_id).unwrap();
loop { loop {
let changed_reachability = let changed_reachability =
self.update_macro_reachable(module_def_id, macro_module_def_id, macro_ev); self.update_macro_reachable(module_def_id, macro_module_def_id, macro_ev);
@ -620,12 +619,12 @@ fn update_macro_reachable_def(
module: LocalDefId, module: LocalDefId,
macro_ev: EffectiveVisibility, macro_ev: EffectiveVisibility,
) { ) {
self.update(def_id, Some(macro_ev), Level::Reachable); self.update(def_id, macro_ev, Level::Reachable);
match def_kind { match def_kind {
// No type privacy, so can be directly marked as reachable. // No type privacy, so can be directly marked as reachable.
DefKind::Const | DefKind::Static(_) | DefKind::TraitAlias | DefKind::TyAlias => { DefKind::Const | DefKind::Static(_) | DefKind::TraitAlias | DefKind::TyAlias => {
if vis.is_accessible_from(module, self.tcx) { if vis.is_accessible_from(module, self.tcx) {
self.update(def_id, Some(macro_ev), Level::Reachable); self.update(def_id, macro_ev, Level::Reachable);
} }
} }
@ -637,7 +636,7 @@ fn update_macro_reachable_def(
let item = self.tcx.hir().expect_item(def_id); let item = self.tcx.hir().expect_item(def_id);
if let hir::ItemKind::Macro(MacroDef { macro_rules: false, .. }, _) = item.kind { if let hir::ItemKind::Macro(MacroDef { macro_rules: false, .. }, _) = item.kind {
if vis.is_accessible_from(module, self.tcx) { if vis.is_accessible_from(module, self.tcx) {
self.update(def_id, Some(macro_ev), Level::Reachable); self.update(def_id, macro_ev, Level::Reachable);
} }
} }
} }
@ -701,86 +700,21 @@ fn update_macro_reachable_def(
impl<'tcx> Visitor<'tcx> for EmbargoVisitor<'tcx> { impl<'tcx> Visitor<'tcx> for EmbargoVisitor<'tcx> {
fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) { fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
let item_ev = match item.kind { // Update levels of nested things and mark all items
hir::ItemKind::Impl { .. } => { // in interfaces of reachable items as reachable.
let impl_ev = Option::<EffectiveVisibility>::of_impl( let item_ev = self.get(item.owner_id.def_id);
item.owner_id.def_id,
self.tcx,
&self.effective_visibilities,
);
self.update_eff_vis(item.owner_id.def_id, impl_ev, None, Level::Direct);
impl_ev
}
_ => self.get(item.owner_id.def_id),
};
// Update levels of nested things.
match item.kind { match item.kind {
hir::ItemKind::Enum(ref def, _) => { // The interface is empty, and no nested items.
for variant in def.variants { hir::ItemKind::Use(..)
self.update(variant.def_id, item_ev, Level::Reachable); | hir::ItemKind::ExternCrate(..)
let variant_ev = self.get(variant.def_id); | hir::ItemKind::GlobalAsm(..) => {}
if let Some(ctor_def_id) = variant.data.ctor_def_id() { // The interface is empty, and all nested items are processed by `visit_item`.
self.update(ctor_def_id, variant_ev, Level::Reachable);
}
for field in variant.data.fields() {
self.update(field.def_id, variant_ev, Level::Reachable);
}
}
}
hir::ItemKind::Impl(ref impl_) => {
for impl_item_ref in impl_.items {
let def_id = impl_item_ref.id.owner_id.def_id;
let nominal_vis =
impl_.of_trait.is_none().then(|| self.tcx.local_visibility(def_id));
self.update_eff_vis(def_id, item_ev, nominal_vis, Level::Direct);
}
}
hir::ItemKind::Trait(.., trait_item_refs) => {
for trait_item_ref in trait_item_refs {
self.update(trait_item_ref.id.owner_id.def_id, item_ev, Level::Reachable);
}
}
hir::ItemKind::Struct(ref def, _) | hir::ItemKind::Union(ref def, _) => {
if let Some(ctor_def_id) = def.ctor_def_id() {
self.update(ctor_def_id, item_ev, Level::Reachable);
}
for field in def.fields() {
self.update(field.def_id, item_ev, Level::Reachable);
}
}
hir::ItemKind::Macro(ref macro_def, _) => {
self.update_reachability_from_macro(item.owner_id.def_id, macro_def);
}
hir::ItemKind::ForeignMod { items, .. } => {
for foreign_item in items {
self.update(foreign_item.id.owner_id.def_id, item_ev, Level::Reachable);
}
}
hir::ItemKind::OpaqueTy(..)
| hir::ItemKind::Use(..)
| hir::ItemKind::Static(..)
| hir::ItemKind::Const(..)
| hir::ItemKind::GlobalAsm(..)
| hir::ItemKind::TyAlias(..)
| hir::ItemKind::Mod(..)
| hir::ItemKind::TraitAlias(..)
| hir::ItemKind::Fn(..)
| hir::ItemKind::ExternCrate(..) => {}
}
// Mark all items in interfaces of reachable items as reachable.
match item.kind {
// The interface is empty.
hir::ItemKind::Macro(..) | hir::ItemKind::ExternCrate(..) => {}
// All nested items are checked by `visit_item`.
hir::ItemKind::Mod(..) => {} hir::ItemKind::Mod(..) => {}
// Handled in `rustc_resolve`. hir::ItemKind::Macro(ref macro_def, _) => {
hir::ItemKind::Use(..) => {} if let Some(item_ev) = item_ev {
// The interface is empty. self.update_reachability_from_macro(item.owner_id.def_id, macro_def, item_ev);
hir::ItemKind::GlobalAsm(..) => {} }
}
hir::ItemKind::OpaqueTy(ref opaque) => { hir::ItemKind::OpaqueTy(ref opaque) => {
// HACK(jynelson): trying to infer the type of `impl trait` breaks `async-std` (and `pub async fn` in general) // HACK(jynelson): trying to infer the type of `impl trait` breaks `async-std` (and `pub async fn` in general)
// Since rustdoc never needs to do codegen and doesn't care about link-time reachability, // Since rustdoc never needs to do codegen and doesn't care about link-time reachability,
@ -797,7 +731,6 @@ fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
.ty(); .ty();
} }
} }
// Visit everything.
hir::ItemKind::Const(..) hir::ItemKind::Const(..)
| hir::ItemKind::Static(..) | hir::ItemKind::Static(..)
| hir::ItemKind::Fn(..) | hir::ItemKind::Fn(..)
@ -811,9 +744,10 @@ fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
self.reach(item.owner_id.def_id, item_ev).generics().predicates(); self.reach(item.owner_id.def_id, item_ev).generics().predicates();
for trait_item_ref in trait_item_refs { for trait_item_ref in trait_item_refs {
self.update(trait_item_ref.id.owner_id.def_id, item_ev, Level::Reachable);
let tcx = self.tcx; let tcx = self.tcx;
let mut reach = self.reach(trait_item_ref.id.owner_id.def_id, item_ev); let mut reach = self.reach(trait_item_ref.id.owner_id.def_id, item_ev);
reach.generics().predicates(); reach.generics().predicates();
if trait_item_ref.kind == AssocItemKind::Type if trait_item_ref.kind == AssocItemKind::Type
@ -831,9 +765,14 @@ fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
self.reach(item.owner_id.def_id, item_ev).generics().predicates(); self.reach(item.owner_id.def_id, item_ev).generics().predicates();
} }
} }
// Visit everything except for private impl items.
hir::ItemKind::Impl(ref impl_) => { hir::ItemKind::Impl(ref impl_) => {
if let Some(item_ev) = item_ev { if let Some(item_ev) = Option::<EffectiveVisibility>::of_impl(
item.owner_id.def_id,
self.tcx,
&self.effective_visibilities,
) {
self.update_eff_vis(item.owner_id.def_id, item_ev, None, Level::Direct);
self.reach(item.owner_id.def_id, item_ev) self.reach(item.owner_id.def_id, item_ev)
.generics() .generics()
.predicates() .predicates()
@ -841,24 +780,32 @@ fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
.trait_ref(); .trait_ref();
for impl_item_ref in impl_.items { for impl_item_ref in impl_.items {
if let Some(impl_item_ev) = self.get(impl_item_ref.id.owner_id.def_id) { let def_id = impl_item_ref.id.owner_id.def_id;
self.reach(impl_item_ref.id.owner_id.def_id, impl_item_ev) let nominal_vis =
.generics() impl_.of_trait.is_none().then(|| self.tcx.local_visibility(def_id));
.predicates() self.update_eff_vis(def_id, item_ev, nominal_vis, Level::Direct);
.ty();
if let Some(impl_item_ev) = self.get(def_id) {
self.reach(def_id, impl_item_ev).generics().predicates().ty();
} }
} }
} }
} }
// Visit everything, but enum variants have their own levels.
hir::ItemKind::Enum(ref def, _) => { hir::ItemKind::Enum(ref def, _) => {
if let Some(item_ev) = item_ev { if let Some(item_ev) = item_ev {
self.reach(item.owner_id.def_id, item_ev).generics().predicates(); self.reach(item.owner_id.def_id, item_ev).generics().predicates();
} }
for variant in def.variants { for variant in def.variants {
if let Some(item_ev) = item_ev {
self.update(variant.def_id, item_ev, Level::Reachable);
}
if let Some(variant_ev) = self.get(variant.def_id) { if let Some(variant_ev) = self.get(variant.def_id) {
if let Some(ctor_def_id) = variant.data.ctor_def_id() {
self.update(ctor_def_id, variant_ev, Level::Reachable);
}
for field in variant.data.fields() { for field in variant.data.fields() {
self.update(field.def_id, variant_ev, Level::Reachable);
self.reach(field.def_id, variant_ev).ty(); self.reach(field.def_id, variant_ev).ty();
} }
// Corner case: if the variant is reachable, but its // Corner case: if the variant is reachable, but its
@ -872,7 +819,6 @@ fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
} }
} }
} }
// Visit everything, but foreign items have their own levels.
hir::ItemKind::ForeignMod { items, .. } => { hir::ItemKind::ForeignMod { items, .. } => {
for foreign_item in items { for foreign_item in items {
if let Some(foreign_item_ev) = self.get(foreign_item.id.owner_id.def_id) { if let Some(foreign_item_ev) = self.get(foreign_item.id.owner_id.def_id) {
@ -883,17 +829,20 @@ fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
} }
} }
} }
// Visit everything except for private fields.
hir::ItemKind::Struct(ref struct_def, _) | hir::ItemKind::Union(ref struct_def, _) => { hir::ItemKind::Struct(ref struct_def, _) | hir::ItemKind::Union(ref struct_def, _) => {
if let Some(item_ev) = item_ev { if let Some(item_ev) = item_ev {
self.reach(item.owner_id.def_id, item_ev).generics().predicates(); self.reach(item.owner_id.def_id, item_ev).generics().predicates();
for field in struct_def.fields() { for field in struct_def.fields() {
self.update(field.def_id, item_ev, Level::Reachable);
if let Some(field_ev) = self.get(field.def_id) { if let Some(field_ev) = self.get(field.def_id) {
self.reach(field.def_id, field_ev).ty(); self.reach(field.def_id, field_ev).ty();
} }
} }
} }
if let Some(ctor_def_id) = struct_def.ctor_def_id() { if let Some(ctor_def_id) = struct_def.ctor_def_id() {
if let Some(item_ev) = item_ev {
self.update(ctor_def_id, item_ev, Level::Reachable);
}
if let Some(ctor_ev) = self.get(ctor_def_id) { if let Some(ctor_ev) = self.get(ctor_def_id) {
self.reach(item.owner_id.def_id, ctor_ev).ty(); self.reach(item.owner_id.def_id, ctor_ev).ty();
} }
@ -953,7 +902,7 @@ fn visit_def_id(
_descr: &dyn fmt::Display, _descr: &dyn fmt::Display,
) -> ControlFlow<Self::BreakTy> { ) -> ControlFlow<Self::BreakTy> {
if let Some(def_id) = def_id.as_local() { if let Some(def_id) = def_id.as_local() {
self.ev.update_eff_vis(def_id, Some(self.effective_vis), None, self.level); self.ev.update_eff_vis(def_id, self.effective_vis, None, self.level);
} }
ControlFlow::Continue(()) ControlFlow::Continue(())
} }