user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Back out "Fix IDE resolution of item macros"

Browse source 
This backs out commit 3e0ab7219a5464999652beca22698cd46e1e48e8.
This commit is contained in:
Lukas Wirth 2025-05-28 07:06:03 +02:00
parent 711546a329
commit 7ec351ec7c
3 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/tools/rust-analyzer/crates/hir-def/src/db.rs
View file

@ -422,7 +422,6 @@ fn macro_def(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
let makro = &item_tree[loc.id.value];
MacroDefId {
krate: loc.container.krate,
block: loc.container.block.map(|block| salsa::plumbing::AsId::as_id(&block)),
kind: kind(loc.expander, loc.id.file_id(), makro.ast_id.upcast()),
local_inner: false,
allow_internal_unsafe: loc.allow_internal_unsafe,
@ -436,7 +435,6 @@ fn macro_def(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
let makro = &item_tree[loc.id.value];
MacroDefId {
krate: loc.container.krate,
block: loc.container.block.map(|block| salsa::plumbing::AsId::as_id(&block)),
kind: kind(loc.expander, loc.id.file_id(), makro.ast_id.upcast()),
local_inner: loc.flags.contains(MacroRulesLocFlags::LOCAL_INNER),
allow_internal_unsafe: loc
@ -452,7 +450,6 @@ fn macro_def(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
let makro = &item_tree[loc.id.value];
MacroDefId {
krate: loc.container.krate,
block: None,
kind: MacroDefKind::ProcMacro(
InFile::new(loc.id.file_id(), makro.ast_id),
loc.expander,

9
src/tools/rust-analyzer/crates/hir-def/src/resolver.rs
View file

@ -696,15 +696,6 @@ impl<'db> Resolver<'db> {
&def_map[local_id].scope
}
pub fn item_scopes(&self) -> impl Iterator<Item = &ItemScope> {
self.scopes()
.filter_map(move |scope| match scope {
Scope::BlockScope(m) => Some(&m.def_map[m.module_id].scope),
_ => None,
})
.chain(std::iter::once(&self.module_scope.def_map[self.module_scope.module_id].scope))
}
pub fn krate(&self) -> Crate {
self.module_scope.def_map.krate()
}

2
src/tools/rust-analyzer/crates/hir-expand/src/lib.rs
View file

@ -258,8 +258,6 @@ pub struct MacroCallLoc {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct MacroDefId {
pub krate: Crate,
// FIXME: In `hir-expand` we can't refer to `BlockId`.
pub block: Option<salsa::Id>,
pub edition: Edition,
pub kind: MacroDefKind,
pub local_inner: bool,