Update builtin tool list

Author: Veykril

src/tools/rust-analyzer/crates/hir-def/src/attr/builtin.rs

@@ -12,9 +12,6 @@ use std::sync::OnceLock;
 
 use rustc_hash::FxHashMap;
 
-/// Ignored attribute namespaces used by tools.
-pubconstTOOL_MODULES:&[&str] = &["rustfmt","clippy"];
-
 pubstructBuiltinAttribute{
 pubname:&'staticstr,
 pubtemplate:AttributeTemplate,

src/tools/rust-analyzer/crates/hir-def/src/nameres.rs

@@ -84,6 +84,14 @@ use crate::{
 LocalModuleId,Lookup,MacroExpander,MacroId,ModuleId,ProcMacroId,UseId,
 };
 
+constPREDEFINED_TOOLS:&[SmolStr] = &[
+SmolStr::new_static("clippy"),
+SmolStr::new_static("rustfmt"),
+SmolStr::new_static("diagnostic"),
+SmolStr::new_static("miri"),
+SmolStr::new_static("rust_analyzer"),
+];
+
 /// Contains the results of (early) name resolution.
 ///
 /// A `DefMap` stores the module tree and the definitions that are in scope in every module after
@@ -160,7 +168,7 @@ impl DefMapCrateData {
 fn_proc_macro_mapping:FxHashMap::default(),
 proc_macro_loading_error:None,
 registered_attrs:Vec::new(),
-registered_tools:Vec::new(),
+registered_tools:PREDEFINED_TOOLS.into(),
 unstable_features:FxHashSet::default(),
 rustc_coherence_is_core:false,
 no_core:false,

src/tools/rust-analyzer/crates/hir-def/src/nameres/attr_resolution.rs

@@ -10,7 +10,7 @@ use syntax::{ast, SmolStr};
 use triomphe::Arc;
 
 usecrate::{
- attr::builtin::{find_builtin_attr_idx,TOOL_MODULES},
+ attr::builtin::find_builtin_attr_idx,
  db::DefDatabase,
  item_scope::BuiltinShadowMode,
  nameres::path_resolution::ResolveMode,
@@ -82,8 +82,7 @@ impl DefMap {
 let name = name.to_smol_str();
 let pred = |n:&_| *n == name;
 
-let registered = self.data.registered_tools.iter().map(SmolStr::as_str);
-let is_tool = TOOL_MODULES.iter().copied().chain(registered).any(pred);
+let is_tool = self.data.registered_tools.iter().map(SmolStr::as_str).any(pred);
 // FIXME: tool modules can be shadowed by actual modules
 if is_tool {
 returntrue;

src/tools/rust-analyzer/crates/hir/src/lib.rs

@@ -3372,34 +3372,21 @@ impl BuiltinAttr {
 
 #[derive(Clone,Copy,Debug,PartialEq,Eq,Hash)]
 pubstructToolModule{
-krate:Option<CrateId>,
+krate:CrateId,
 idx:u32,
 }
 
 implToolModule{
-// FIXME: consider crates\hir_def\src\nameres\attr_resolution.rs?
 pub(crate)fnby_name(db:&dynHirDatabase,krate:Crate,name:&str) -> Option<Self>{
-iflet builtin @ Some(_) = Self::builtin(name){
-return builtin;
-}
+let krate = krate.id;
 let idx =
- db.crate_def_map(krate.id).registered_tools().iter().position(|it| it == name)? asu32;
-Some(ToolModule{krate:Some(krate.id), idx })
-}
-
-fnbuiltin(name:&str) -> Option<Self>{
- hir_def::attr::builtin::TOOL_MODULES
-.iter()
-.position(|&tool| tool == name)
-.map(|idx| ToolModule{krate:None,idx: idx asu32})
+ db.crate_def_map(krate).registered_tools().iter().position(|it| it == name)? asu32;
+Some(ToolModule{ krate, idx })
 }
 
 pubfnname(&self,db:&dynHirDatabase) -> SmolStr{
 // FIXME: Return a `Name` here
-matchself.krate{
-Some(krate) => db.crate_def_map(krate).registered_tools()[self.idxasusize].clone(),
-None => SmolStr::new(hir_def::attr::builtin::TOOL_MODULES[self.idxasusize]),
-}
+ db.crate_def_map(self.krate).registered_tools()[self.idxasusize].clone()
 }
 }