language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-29 02:52:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #19706 from Veykril/push-nkpmknlvzyom

Browse source 
fix: Address minor FIXME
This commit is contained in:
Lukas Wirth 2025-04-28 10:12:20 +00:00 • committed by GitHub
commit 5adee2ad2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -167,7 +167,7 @@ pub struct ItemScope {
// 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<ImportOrGlob, ImportOrDef>, use_imports_macros: FxHashMap<ImportOrExternCrate, ImportOrDef>,
use_decls: Vec<UseId>, use_decls: Vec<UseId>,
extern_crate_decls: Vec<ExternCrateId>, extern_crate_decls: Vec<ExternCrateId>,
@ -242,7 +242,7 @@ impl ItemScope {
self.types.iter().map(|(n, &i)| (n, i)) self.types.iter().map(|(n, &i)| (n, i))
} }
pub fn macros(&self) -> impl Iterator<Item = (&Name, Item<MacroId, ImportOrGlob>)> + '_ { pub fn macros(&self) -> impl Iterator<Item = (&Name, Item<MacroId, ImportOrExternCrate>)> + '_ {
self.macros.iter().map(|(n, &i)| (n, i)) self.macros.iter().map(|(n, &i)| (n, i))
} }
@ -250,9 +250,9 @@ impl ItemScope {
self.use_imports_types self.use_imports_types
.keys() .keys()
.copied() .copied()
.chain(self.use_imports_macros.keys().copied())
.filter_map(ImportOrExternCrate::import_or_glob) .filter_map(ImportOrExternCrate::import_or_glob)
.chain(self.use_imports_values.keys().copied()) .chain(self.use_imports_values.keys().copied())
.chain(self.use_imports_macros.keys().copied())
.filter_map(ImportOrGlob::into_import) .filter_map(ImportOrGlob::into_import)
.sorted() .sorted()
.dedup() .dedup()
@ -263,7 +263,7 @@ impl ItemScope {
let mut def_map; let mut def_map;
let mut scope = self; let mut scope = self;
while let Some(&m) = scope.use_imports_macros.get(&ImportOrGlob::Import(import)) { while let Some(&m) = scope.use_imports_macros.get(&ImportOrExternCrate::Import(import)) {
match m { match m {
ImportOrDef::Import(i) => { ImportOrDef::Import(i) => {
let module_id = i.use_.lookup(db).container; let module_id = i.use_.lookup(db).container;
@ -682,7 +682,6 @@ impl ItemScope {
} }
_ => _ = glob_imports.macros.remove(&lookup), _ => _ = glob_imports.macros.remove(&lookup),
} }
let import = import.and_then(ImportOrExternCrate::import_or_glob);
let prev = std::mem::replace(&mut fld.import, import); let prev = std::mem::replace(&mut fld.import, import);
if let Some(import) = import { if let Some(import) = import {
self.use_imports_macros.insert( self.use_imports_macros.insert(
@ -698,7 +697,6 @@ impl ItemScope {
{ {
if glob_imports.macros.remove(&lookup) { if glob_imports.macros.remove(&lookup) {
cov_mark::hit!(import_shadowed); cov_mark::hit!(import_shadowed);
let import = import.and_then(ImportOrExternCrate::import_or_glob);
let prev = std::mem::replace(&mut fld.import, import); let prev = std::mem::replace(&mut fld.import, import);
if let Some(import) = import { if let Some(import) = import {
self.use_imports_macros.insert( self.use_imports_macros.insert(
@ -783,8 +781,9 @@ impl ItemScope {
if let Some(Item { import, .. }) = def.macros { if let Some(Item { import, .. }) = def.macros {
buf.push_str(" m"); buf.push_str(" m");
match import { match import {
Some(ImportOrGlob::Import(_)) => buf.push('i'), Some(ImportOrExternCrate::Import(_)) => buf.push('i'),
Some(ImportOrGlob::Glob(_)) => buf.push('g'), Some(ImportOrExternCrate::Glob(_)) => buf.push('g'),
Some(ImportOrExternCrate::ExternCrate(_)) => buf.push('e'),
None => (), None => (),
} }
} }
@ -893,9 +892,7 @@ impl PerNs {
ModuleDefId::TraitAliasId(_) => PerNs::types(def, v, import), ModuleDefId::TraitAliasId(_) => PerNs::types(def, v, import),
ModuleDefId::TypeAliasId(_) => PerNs::types(def, v, import), ModuleDefId::TypeAliasId(_) => PerNs::types(def, v, import),
ModuleDefId::BuiltinType(_) => PerNs::types(def, v, import), ModuleDefId::BuiltinType(_) => PerNs::types(def, v, import),
ModuleDefId::MacroId(mac) => { ModuleDefId::MacroId(mac) => PerNs::macros(mac, v, import),
PerNs::macros(mac, v, import.and_then(ImportOrExternCrate::import_or_glob))
}
} }
} }
} }

5
crates/hir-def/src/nameres/path_resolution.rs
View file

@ -673,12 +673,11 @@ impl DefMap {
} }
fn resolve_in_macro_use_prelude(&self, name: &Name) -> PerNs { fn resolve_in_macro_use_prelude(&self, name: &Name) -> PerNs {
self.macro_use_prelude.get(name).map_or(PerNs::none(), |&(it, _extern_crate)| { self.macro_use_prelude.get(name).map_or(PerNs::none(), |&(it, extern_crate)| {
PerNs::macros( PerNs::macros(
it, it,
Visibility::Public, Visibility::Public,
// FIXME? extern_crate.map(ImportOrExternCrate::ExternCrate),
None, // extern_crate.map(ImportOrExternCrate::ExternCrate),
) )
}) })
} }

12
crates/hir-def/src/per_ns.rs
View file

@ -37,7 +37,8 @@ pub struct Item<Def, Import = ImportId> {
pub type TypesItem = Item<ModuleDefId, ImportOrExternCrate>; pub type TypesItem = Item<ModuleDefId, ImportOrExternCrate>;
pub type ValuesItem = Item<ModuleDefId, ImportOrGlob>; pub type ValuesItem = Item<ModuleDefId, ImportOrGlob>;
pub type MacrosItem = Item<MacroId, ImportOrGlob>; // May be Externcrate for `[macro_use]`'d macros
pub type MacrosItem = Item<MacroId, ImportOrExternCrate>;
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)] #[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
pub struct PerNs { pub struct PerNs {
@ -84,7 +85,7 @@ impl PerNs {
} }
} }
pub fn macros(def: MacroId, vis: Visibility, import: Option<ImportOrGlob>) -> PerNs { pub fn macros(def: MacroId, vis: Visibility, import: Option<ImportOrExternCrate>) -> PerNs {
PerNs { types: None, values: None, macros: Some(Item { def, vis, import }) } PerNs { types: None, values: None, macros: Some(Item { def, vis, import }) }
} }
@ -116,7 +117,7 @@ impl PerNs {
self.macros.map(|it| it.def) self.macros.map(|it| it.def)
} }
pub fn take_macros_import(self) -> Option<(MacroId, Option<ImportOrGlob>)> { pub fn take_macros_import(self) -> Option<(MacroId, Option<ImportOrExternCrate>)> {
self.macros.map(|it| (it.def, it.import)) self.macros.map(|it| (it.def, it.import))
} }
@ -158,9 +159,6 @@ impl PerNs {
self.values self.values
.map(|it| (ItemInNs::Values(it.def), it.import.map(ImportOrExternCrate::from))), .map(|it| (ItemInNs::Values(it.def), it.import.map(ImportOrExternCrate::from))),
) )
.chain( .chain(self.macros.map(|it| (ItemInNs::Macros(it.def), it.import)))
self.macros
.map(|it| (ItemInNs::Macros(it.def), it.import.map(ImportOrExternCrate::from))),
)
} }
} }

2
crates/hir-def/src/resolver.rs
View file

@ -493,7 +493,7 @@ impl Resolver {
db: &dyn DefDatabase, db: &dyn DefDatabase,
path: &ModPath, path: &ModPath,
expected_macro_kind: Option<MacroSubNs>, expected_macro_kind: Option<MacroSubNs>,
) -> Option<(MacroId, Option<ImportOrGlob>)> { ) -> Option<(MacroId, Option<ImportOrExternCrate>)> {
let (item_map, item_local_map, module) = self.item_scope_(); let (item_map, item_local_map, module) = self.item_scope_();
item_map item_map
.resolve_path( .resolve_path(

5
crates/hir/src/symbols.rs
View file

@ -263,8 +263,9 @@ impl<'a> SymbolCollector<'a> {
for (name, Item { def, vis, import }) in scope.macros() { for (name, Item { def, vis, import }) in scope.macros() {
if let Some(i) = import { if let Some(i) = import {
match i { match i {
ImportOrGlob::Import(i) => push_import(self, i, name, def.into(), vis), ImportOrExternCrate::Import(i) => push_import(self, i, name, def.into(), vis),
ImportOrGlob::Glob(_) => (), ImportOrExternCrate::Glob(_) => (),
ImportOrExternCrate::ExternCrate(_) => (),
} }
continue; continue;
} }