language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-28 10:39:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use ThinVec in ItemScope in a couple places

Browse source
This commit is contained in:
Lukas Wirth 2025-06-13 15:34:03 +02:00
parent b9ce647cf1
commit 9f051ee104
1 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
crates/hir-def/src/item_scope.rs
View file

@ -13,6 +13,7 @@ use smallvec::{SmallVec, smallvec};
use span::Edition; use span::Edition;
use stdx::format_to; use stdx::format_to;
use syntax::ast; use syntax::ast;
use thin_vec::ThinVec;
use crate::{ use crate::{
AdtId, BuiltinType, ConstId, ExternBlockId, ExternCrateId, FxIndexMap, HasModule, ImplId, AdtId, BuiltinType, ConstId, ExternBlockId, ExternCrateId, FxIndexMap, HasModule, ImplId,
@ -155,22 +156,21 @@ pub struct ItemScope {
/// The defs declared in this scope. Each def has a single scope where it is /// The defs declared in this scope. Each def has a single scope where it is
/// declared. /// declared.
declarations: Vec<ModuleDefId>, declarations: ThinVec<ModuleDefId>,
impls: Vec<ImplId>, impls: ThinVec<ImplId>,
#[allow(clippy::box_collection)] extern_blocks: ThinVec<ExternBlockId>,
extern_blocks: Option<Box<Vec<ExternBlockId>>>, unnamed_consts: ThinVec<ConstId>,
unnamed_consts: Vec<ConstId>,
/// Traits imported via `use Trait as _;`. /// Traits imported via `use Trait as _;`.
unnamed_trait_imports: FxHashMap<TraitId, Item<()>>, unnamed_trait_imports: ThinVec<(TraitId, Item<()>)>,
// the resolutions of the imports of this scope // the resolutions of the imports of this scope
use_imports_types: FxHashMap<ImportOrExternCrate, ImportOrDef>, use_imports_types: FxHashMap<ImportOrExternCrate, ImportOrDef>,
use_imports_values: FxHashMap<ImportOrGlob, ImportOrDef>, use_imports_values: FxHashMap<ImportOrGlob, ImportOrDef>,
use_imports_macros: FxHashMap<ImportOrExternCrate, ImportOrDef>, use_imports_macros: FxHashMap<ImportOrExternCrate, ImportOrDef>,
use_decls: Vec<UseId>, use_decls: ThinVec<UseId>,
extern_crate_decls: Vec<ExternCrateId>, extern_crate_decls: ThinVec<ExternCrateId>,
/// Macros visible in current module in legacy textual scope /// Macros visible in current module in legacy textual scope
/// ///
/// For macros invoked by an unqualified identifier like `bar!()`, `legacy_macros` will be searched in first. /// For macros invoked by an unqualified identifier like `bar!()`, `legacy_macros` will be searched in first.
@ -183,7 +183,7 @@ pub struct ItemScope {
/// Module scoped macros will be inserted into `items` instead of here. /// Module scoped macros will be inserted into `items` instead of here.
// FIXME: Macro shadowing in one module is not properly handled. Non-item place macros will // FIXME: Macro shadowing in one module is not properly handled. Non-item place macros will
// be all resolved to the last one defined if shadowing happens. // be all resolved to the last one defined if shadowing happens.
legacy_macros: FxHashMap<Name, SmallVec<[MacroId; 1]>>, legacy_macros: FxHashMap<Name, SmallVec<[MacroId; 2]>>,
/// The attribute macro invocations in this scope. /// The attribute macro invocations in this scope.
attr_macros: FxHashMap<AstId<ast::Item>, MacroCallId>, attr_macros: FxHashMap<AstId<ast::Item>, MacroCallId>,
/// The macro invocations in this scope. /// The macro invocations in this scope.
@ -198,7 +198,7 @@ struct DeriveMacroInvocation {
attr_id: AttrId, attr_id: AttrId,
/// The `#[derive]` call /// The `#[derive]` call
attr_call_id: MacroCallId, attr_call_id: MacroCallId,
derive_call_ids: SmallVec<[Option<MacroCallId>; 1]>, derive_call_ids: SmallVec<[Option<MacroCallId>; 4]>,
} }
pub(crate) static BUILTIN_SCOPE: LazyLock<FxIndexMap<Name, PerNs>> = LazyLock::new(|| { pub(crate) static BUILTIN_SCOPE: LazyLock<FxIndexMap<Name, PerNs>> = LazyLock::new(|| {
@ -322,7 +322,7 @@ impl ItemScope {
} }
pub fn extern_blocks(&self) -> impl Iterator<Item = ExternBlockId> + '_ { pub fn extern_blocks(&self) -> impl Iterator<Item = ExternBlockId> + '_ {
self.extern_blocks.iter().flat_map(|it| it.iter()).copied() self.extern_blocks.iter().copied()
} }
pub fn use_decls(&self) -> impl ExactSizeIterator<Item = UseId> + '_ { pub fn use_decls(&self) -> impl ExactSizeIterator<Item = UseId> + '_ {
@ -435,7 +435,7 @@ impl ItemScope {
ModuleDefId::TraitId(t) => Some(t), ModuleDefId::TraitId(t) => Some(t),
_ => None, _ => None,
}) })
.chain(self.unnamed_trait_imports.keys().copied()) .chain(self.unnamed_trait_imports.iter().map(|&(t, _)| t))
} }
pub(crate) fn resolutions(&self) -> impl Iterator<Item = (Option<Name>, PerNs)> + '_ { pub(crate) fn resolutions(&self) -> impl Iterator<Item = (Option<Name>, PerNs)> + '_ {
@ -476,7 +476,7 @@ impl ItemScope {
} }
pub(crate) fn define_extern_block(&mut self, extern_block: ExternBlockId) { pub(crate) fn define_extern_block(&mut self, extern_block: ExternBlockId) {
self.extern_blocks.get_or_insert_default().push(extern_block); self.extern_blocks.push(extern_block);
} }
pub(crate) fn define_extern_crate_decl(&mut self, extern_crate: ExternCrateId) { pub(crate) fn define_extern_crate_decl(&mut self, extern_crate: ExternCrateId) {
@ -564,7 +564,7 @@ impl ItemScope {
// FIXME: This is only used in collection, we should move the relevant parts of it out of ItemScope // FIXME: This is only used in collection, we should move the relevant parts of it out of ItemScope
pub(crate) fn unnamed_trait_vis(&self, tr: TraitId) -> Option<Visibility> { pub(crate) fn unnamed_trait_vis(&self, tr: TraitId) -> Option<Visibility> {
self.unnamed_trait_imports.get(&tr).map(|trait_| trait_.vis) self.unnamed_trait_imports.iter().find(|&&(t, _)| t == tr).map(|(_, trait_)| trait_.vis)
} }
pub(crate) fn push_unnamed_trait( pub(crate) fn push_unnamed_trait(
@ -573,7 +573,7 @@ impl ItemScope {
vis: Visibility, vis: Visibility,
import: Option<ImportId>, import: Option<ImportId>,
) { ) {
self.unnamed_trait_imports.insert(tr, Item { def: (), vis, import }); self.unnamed_trait_imports.push((tr, Item { def: (), vis, import }));
} }
pub(crate) fn push_res_with_import( pub(crate) fn push_res_with_import(
@ -725,7 +725,7 @@ impl ItemScope {
.values_mut() .values_mut()
.map(|def| &mut def.vis) .map(|def| &mut def.vis)
.chain(self.values.values_mut().map(|def| &mut def.vis)) .chain(self.values.values_mut().map(|def| &mut def.vis))
.chain(self.unnamed_trait_imports.values_mut().map(|def| &mut def.vis)) .chain(self.unnamed_trait_imports.iter_mut().map(|(_, def)| &mut def.vis))
.for_each(|vis| match vis { .for_each(|vis| match vis {
&mut Visibility::Module(_, visibility_explicitness) => { &mut Visibility::Module(_, visibility_explicitness) => {
*vis = Visibility::Module(this_module, visibility_explicitness) *vis = Visibility::Module(this_module, visibility_explicitness)
@ -817,9 +817,7 @@ impl ItemScope {
macro_invocations, macro_invocations,
extern_blocks, extern_blocks,
} = self; } = self;
if let Some(it) = extern_blocks { extern_blocks.shrink_to_fit();
it.shrink_to_fit();
}
types.shrink_to_fit(); types.shrink_to_fit();
values.shrink_to_fit(); values.shrink_to_fit();
macros.shrink_to_fit(); macros.shrink_to_fit();