Skip to content

Commit 5bbf8aa

Browse files
VeykrilVeykril
committed
Optimize pub(crate) visibility resolution
1 parent 623b670 commit 5bbf8aa

File tree

11 files changed

+49
-32
lines changed

11 files changed

+49
-32
lines changed

‎crates/hir-def/src/expr_store/pretty.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ pub fn print_variant_body_hir(db: &dyn DefDatabase, owner: VariantId, edition: E
144144
w!(p, "{}", interned.display(db, p.edition))
145145
}
146146
crate::item_tree::RawVisibility::Public => w!(p, "pub "),
147+
crate::item_tree::RawVisibility::PubCrate => w!(p, "pub(crate) "),
147148
}
148149
if *is_unsafe {
149150
w!(p, "unsafe ");

‎crates/hir-def/src/find_path.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ fn find_local_import_locations(
613613
cov_mark::hit!(discount_private_imports);
614614
false
615615
}
616+
Visibility::PubCrate(_) => true,
616617
Visibility::Public => true,
617618
};
618619

‎crates/hir-def/src/item_scope.rs

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::{
2020
Lookup, MacroId, ModuleDefId, ModuleId, TraitId, UseId,
2121
db::DefDatabase,
2222
per_ns::{Item, MacrosItem, PerNs, TypesItem, ValuesItem},
23-
visibility::{Visibility, VisibilityExplicitness},
23+
visibility::Visibility,
2424
};
2525

2626
#[derive(Debug, Default)]
@@ -716,33 +716,19 @@ impl ItemScope {
716716
}
717717

718718
/// Marks everything that is not a procedural macro as private to `this_module`.
719-
pub(crate) fn censor_non_proc_macros(&mut self, this_module: ModuleId) {
719+
pub(crate) fn censor_non_proc_macros(&mut self, krate: Crate) {
720720
self.types
721721
.values_mut()
722722
.map(|def| &mut def.vis)
723723
.chain(self.values.values_mut().map(|def| &mut def.vis))
724724
.chain(self.unnamed_trait_imports.iter_mut().map(|(_, def)| &mut def.vis))
725-
.for_each(|vis| match vis {
726-
&mut Visibility::Module(_, visibility_explicitness) => {
727-
*vis = Visibility::Module(this_module, visibility_explicitness)
728-
}
729-
Visibility::Public => {
730-
*vis = Visibility::Module(this_module, VisibilityExplicitness::Implicit)
731-
}
732-
});
725+
.for_each(|vis| *vis = Visibility::PubCrate(krate));
733726

734727
for mac in self.macros.values_mut() {
735728
if matches!(mac.def, MacroId::ProcMacroId(_) if mac.import.is_none()) {
736729
continue;
737730
}
738-
match mac.vis {
739-
Visibility::Module(_, visibility_explicitness) => {
740-
mac.vis = Visibility::Module(this_module, visibility_explicitness)
741-
}
742-
Visibility::Public => {
743-
mac.vis = Visibility::Module(this_module, VisibilityExplicitness::Implicit)
744-
}
745-
}
731+
mac.vis = Visibility::PubCrate(krate)
746732
}
747733
}
748734

‎crates/hir-def/src/item_tree.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ impl Index<RawVisibilityId> for ItemTree {
416416
static VIS_PUB: RawVisibility = RawVisibility::Public;
417417
static VIS_PRIV_IMPLICIT: OnceLock<RawVisibility> = OnceLock::new();
418418
static VIS_PRIV_EXPLICIT: OnceLock<RawVisibility> = OnceLock::new();
419-
static VIS_PUB_CRATE: OnceLock<RawVisibility> = OnceLock::new();
419+
static VIS_PUB_CRATE: RawVisibility = RawVisibility::PubCrate;
420420

421421
match index {
422422
RawVisibilityId::PRIV_IMPLICIT => VIS_PRIV_IMPLICIT.get_or_init(|| {
@@ -432,12 +432,7 @@ impl Index<RawVisibilityId> for ItemTree {
432432
)
433433
}),
434434
RawVisibilityId::PUB => &VIS_PUB,
435-
RawVisibilityId::PUB_CRATE => VIS_PUB_CRATE.get_or_init(|| {
436-
RawVisibility::Module(
437-
Interned::new(ModPath::from_kind(PathKind::Crate)),
438-
VisibilityExplicitness::Explicit,
439-
)
440-
}),
435+
RawVisibilityId::PUB_CRATE => &VIS_PUB_CRATE,
441436
_ => &self.vis.arena[index.0 as usize],
442437
}
443438
}
@@ -555,6 +550,8 @@ pub enum RawVisibility {
555550
/// `pub(in module)`, `pub(crate)` or `pub(super)`. Also private, which is
556551
/// equivalent to `pub(self)`.
557552
Module(Interned<ModPath>, VisibilityExplicitness),
553+
/// `pub(crate)`.
554+
PubCrate,
558555
/// `pub`.
559556
Public,
560557
}

‎crates/hir-def/src/item_tree/pretty.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ impl Printer<'_> {
111111
w!(self, "pub({}) ", path.display(self.db, self.edition))
112112
}
113113
RawVisibility::Public => w!(self, "pub "),
114+
RawVisibility::PubCrate => w!(self, "pub(crate) "),
114115
};
115116
}
116117

‎crates/hir-def/src/nameres/collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ impl<'db> DefCollector<'db> {
446446
// in the crate root that aren't proc macros.
447447
let module_id = self.def_map.root_module_id();
448448
let root = &mut self.def_map.modules[module_id];
449-
root.scope.censor_non_proc_macros(module_id);
449+
root.scope.censor_non_proc_macros(self.def_map.krate);
450450
}
451451
}
452452

‎crates/hir-def/src/nameres/path_resolution.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ impl DefMap {
129129
}
130130
}
131131
RawVisibility::Public => Visibility::Public,
132+
RawVisibility::PubCrate => Visibility::PubCrate(self.krate),
132133
};
133134

134135
// In block expressions, `self` normally refers to the containing non-block module, and

‎crates/hir-def/src/resolver.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ impl<'db> Resolver<'db> {
305305
}),
306306
)
307307
}
308+
RawVisibility::PubCrate => Some(Visibility::PubCrate(self.krate())),
308309
RawVisibility::Public => Some(Visibility::Public),
309310
}
310311
}

‎crates/hir-def/src/visibility.rs

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
use std::iter;
44

5+
use base_db::Crate;
56
use hir_expand::{InFile, Lookup};
67
use la_arena::ArenaMap;
78
use syntax::ast::{self, HasVisibility};
@@ -23,6 +24,8 @@ pub use crate::item_tree::{RawVisibility, VisibilityExplicitness};
2324
pub enum Visibility {
2425
/// Visibility is restricted to a certain module.
2526
Module(ModuleId, VisibilityExplicitness),
27+
/// Visibility is restricted to the crate.
28+
PubCrate(Crate),
2629
/// Visibility is unrestricted.
2730
Public,
2831
}
@@ -45,6 +48,7 @@ impl Visibility {
4548
pub fn is_visible_from(self, db: &dyn DefDatabase, from_module: ModuleId) -> bool {
4649
let to_module = match self {
4750
Visibility::Module(m, _) => m,
51+
Visibility::PubCrate(krate) => return from_module.krate(db) == krate,
4852
Visibility::Public => return true,
4953
};
5054
// if they're not in the same crate, it can't be visible
@@ -66,6 +70,7 @@ impl Visibility {
6670
}
6771
let to_module = match self {
6872
Visibility::Module(m, _) => m,
73+
Visibility::PubCrate(krate) => return from_module.krate(db) == krate,
6974
Visibility::Public => return true,
7075
};
7176
// if they're not in the same crate, it can't be visible
@@ -144,24 +149,35 @@ impl Visibility {
144149
) -> Option<Visibility> {
145150
match (self, other) {
146151
(_, Visibility::Public) | (Visibility::Public, _) => Some(Visibility::Public),
152+
(Visibility::PubCrate(krate), Visibility::PubCrate(krateb)) => {
153+
if krate == krateb {
154+
Some(Visibility::PubCrate(krate))
155+
} else {
156+
None
157+
}
158+
}
159+
(Visibility::Module(mod_, _), Visibility::PubCrate(krate))
160+
| (Visibility::PubCrate(krate), Visibility::Module(mod_, _)) => {
161+
if mod_.krate(db) == krate { Some(Visibility::PubCrate(krate)) } else { None }
162+
}
147163
(Visibility::Module(mod_a, expl_a), Visibility::Module(mod_b, expl_b)) => {
148-
if mod_a.krate(db) != mod_b.krate(db) {
164+
if mod_a.krate(db) != def_map.krate() || mod_b.krate(db) != def_map.krate() {
149165
return None;
150166
}
151167

152168
let def_block = def_map.block_id();
153-
if (mod_a.block(db), mod_b.block(db)) != (def_block, def_block) {
169+
if mod_a.block(db) != def_block || mod_b.block(db) != def_block {
154170
return None;
155171
}
156172

157173
let mut a_ancestors = iter::successors(Some(mod_a), |&m| def_map[m].parent);
158-
let mut b_ancestors = iter::successors(Some(mod_b), |&m| def_map[m].parent);
159174

160175
if a_ancestors.any(|m| m == mod_b) {
161176
// B is above A
162177
return Some(Visibility::Module(mod_b, expl_b));
163178
}
164179

180+
let mut b_ancestors = iter::successors(Some(mod_b), |&m| def_map[m].parent);
165181
if b_ancestors.any(|m| m == mod_a) {
166182
// A is above B
167183
return Some(Visibility::Module(mod_a, expl_a));
@@ -184,24 +200,35 @@ impl Visibility {
184200
) -> Option<Visibility> {
185201
match (self, other) {
186202
(vis, Visibility::Public) | (Visibility::Public, vis) => Some(vis),
203+
(Visibility::PubCrate(krate), Visibility::PubCrate(krateb)) => {
204+
if krate == krateb {
205+
Some(Visibility::PubCrate(krate))
206+
} else {
207+
None
208+
}
209+
}
210+
(Visibility::Module(mod_, exp), Visibility::PubCrate(krate))
211+
| (Visibility::PubCrate(krate), Visibility::Module(mod_, exp)) => {
212+
if mod_.krate(db) == krate { Some(Visibility::Module(mod_, exp)) } else { None }
213+
}
187214
(Visibility::Module(mod_a, expl_a), Visibility::Module(mod_b, expl_b)) => {
188-
if mod_a.krate(db) != mod_b.krate(db) {
215+
if mod_a.krate(db) != def_map.krate() || mod_b.krate(db) != def_map.krate() {
189216
return None;
190217
}
191218

192219
let def_block = def_map.block_id();
193-
if (mod_a.block(db), mod_b.block(db)) != (def_block, def_block) {
220+
if mod_a.block(db) != def_block || mod_b.block(db) != def_block {
194221
return None;
195222
}
196223

197224
let mut a_ancestors = iter::successors(Some(mod_a), |&m| def_map[m].parent);
198-
let mut b_ancestors = iter::successors(Some(mod_b), |&m| def_map[m].parent);
199225

200226
if a_ancestors.any(|m| m == mod_b) {
201227
// B is above A
202228
return Some(Visibility::Module(mod_a, expl_a));
203229
}
204230

231+
let mut b_ancestors = iter::successors(Some(mod_b), |&m| def_map[m].parent);
205232
if b_ancestors.any(|m| m == mod_a) {
206233
// A is above B
207234
return Some(Visibility::Module(mod_b, expl_b));

‎crates/hir-ty/src/display.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,6 +2081,7 @@ pub fn write_visibility(
20812081
) -> Result<(), HirDisplayError> {
20822082
match vis {
20832083
Visibility::Public => write!(f, "pub "),
2084+
Visibility::PubCrate(_) => write!(f, "pub(crate) "),
20842085
Visibility::Module(vis_id, _) => {
20852086
let def_map = module_id.def_map(f.db);
20862087
let root_module_id = def_map.root_module_id();

0 commit comments

Comments
 (0)