itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use hir_def::builtin_attr::find_builtin_attr_idx

Browse Source
This commit is contained in:
Lukas Wirth 2023-04-06 19:44:06 +02:00
parent 99b69525f4
commit 40c068f502
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/hir-def/src/nameres/attr_resolution.rs
View File

@ -83,12 +83,9 @@ impl DefMap {
} }
if segments.len() == 1 { if segments.len() == 1 {
let registered = self.registered_attrs.iter().map(SmolStr::as_str); let mut registered = self.registered_attrs.iter().map(SmolStr::as_str);
let is_inert = builtin_attr::INERT_ATTRIBUTES let is_inert =
.iter() builtin_attr::find_builtin_attr_idx(&name).is_some() || registered.any(pred);
.map(|it| it.name)
.chain(registered)
.any(pred);
return is_inert; return is_inert;
} }
} }

4
crates/hir/src/lib.rs
View File

@ -2697,9 +2697,7 @@ impl BuiltinAttr {
} }
fn builtin(name: &str) -> Option<Self> { fn builtin(name: &str) -> Option<Self> {
hir_def::builtin_attr::INERT_ATTRIBUTES hir_def::builtin_attr::find_builtin_attr_idx(name)
.iter()
.position(|tool| tool.name == name)
.map(|idx| BuiltinAttr { krate: None, idx: idx as u32 }) .map(|idx| BuiltinAttr { krate: None, idx: idx as u32 })
} }