From df824c2f81db07782a6f64c31e5981ba1593256e Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 20 May 2021 20:18:53 +0200 Subject: Rename `ignore_attrs_on` to `skip_attrs` --- crates/hir_def/src/nameres/collector.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates') diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs index dfed729df..897b28e1a 100644 --- a/crates/hir_def/src/nameres/collector.rs +++ b/crates/hir_def/src/nameres/collector.rs @@ -100,7 +100,7 @@ pub(super) fn collect_defs( proc_macros, exports_proc_macros: false, from_glob_import: Default::default(), - ignore_attrs_on: Default::default(), + skip_attrs: Default::default(), derive_helpers_in_scope: Default::default(), }; match block { @@ -253,7 +253,7 @@ struct DefCollector<'a> { /// /// This also stores the attributes to skip when we resolve derive helpers and non-macro /// non-builtin attributes in general. - ignore_attrs_on: FxHashMap, AttrId>, + skip_attrs: FxHashMap, AttrId>, /// Tracks which custom derives are in scope for an item, to allow resolution of derive helper /// attributes. derive_helpers_in_scope: FxHashMap, Vec>, @@ -382,7 +382,7 @@ impl DefCollector<'_> { let mut unresolved_macros = std::mem::replace(&mut self.unresolved_macros, Vec::new()); let pos = unresolved_macros.iter().position(|directive| { if let MacroDirectiveKind::Attr { ast_id, mod_item, attr } = &directive.kind { - self.ignore_attrs_on.insert(ast_id.ast_id.with_value(*mod_item), *attr); + self.skip_attrs.insert(ast_id.ast_id.with_value(*mod_item), *attr); let file_id = ast_id.ast_id.file_id; let item_tree = self.db.file_item_tree(file_id); @@ -941,7 +941,7 @@ impl DefCollector<'_> { let file_id = ast_id.ast_id.file_id; let item_tree = self.db.file_item_tree(file_id); let mod_dir = self.mod_dirs[&directive.module_id].clone(); - self.ignore_attrs_on.insert(InFile::new(file_id, *mod_item), *attr); + self.skip_attrs.insert(InFile::new(file_id, *mod_item), *attr); ModCollector { def_collector: &mut *self, macro_depth: directive.depth, @@ -1504,7 +1504,7 @@ impl ModCollector<'_, '_> { } let mut ignore_up_to = - self.def_collector.ignore_attrs_on.get(&InFile::new(self.file_id, mod_item)).copied(); + self.def_collector.skip_attrs.get(&InFile::new(self.file_id, mod_item)).copied(); for attr in attrs.iter().skip_while(|attr| match ignore_up_to { Some(id) if attr.id == id => { ignore_up_to = None; @@ -1779,7 +1779,7 @@ mod tests { proc_macros: Default::default(), exports_proc_macros: false, from_glob_import: Default::default(), - ignore_attrs_on: Default::default(), + skip_attrs: Default::default(), derive_helpers_in_scope: FxHashMap::default(), }; collector.seed_with_top_level(); -- cgit v1.2.3 From 6f19484c93b1d3bcbef8a271443742a3db3e8fae Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 20 May 2021 20:40:02 +0200 Subject: Support `#[register_attr]` and `#[register_tool]` --- crates/hir_def/src/nameres/collector.rs | 107 +++++++++++++++++------- crates/hir_def/src/nameres/tests/diagnostics.rs | 17 ++++ crates/hir_expand/src/name.rs | 2 + 3 files changed, 94 insertions(+), 32 deletions(-) (limited to 'crates') diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs index 897b28e1a..e76d039b8 100644 --- a/crates/hir_def/src/nameres/collector.rs +++ b/crates/hir_def/src/nameres/collector.rs @@ -20,7 +20,7 @@ use rustc_hash::{FxHashMap, FxHashSet}; use syntax::ast; use crate::{ - attr::{Attr, AttrId, Attrs}, + attr::{Attr, AttrId, AttrInput, Attrs}, builtin_attr, db::DefDatabase, derive_macro_as_call_id, @@ -102,6 +102,8 @@ pub(super) fn collect_defs( from_glob_import: Default::default(), skip_attrs: Default::default(), derive_helpers_in_scope: Default::default(), + registered_attrs: Default::default(), + registered_tools: Default::default(), }; match block { Some(block) => { @@ -257,6 +259,10 @@ struct DefCollector<'a> { /// Tracks which custom derives are in scope for an item, to allow resolution of derive helper /// attributes. derive_helpers_in_scope: FxHashMap, Vec>, + /// Custom attributes registered with `#![register_attr]`. + registered_attrs: Vec, + /// Custom tool modules registered with `#![register_tool]`. + registered_tools: Vec, } impl DefCollector<'_> { @@ -265,11 +271,39 @@ impl DefCollector<'_> { let item_tree = self.db.file_item_tree(file_id.into()); let module_id = self.def_map.root; self.def_map.modules[module_id].origin = ModuleOrigin::CrateRoot { definition: file_id }; - if item_tree - .top_level_attrs(self.db, self.def_map.krate) - .cfg() - .map_or(true, |cfg| self.cfg_options.check(&cfg) != Some(false)) - { + + let attrs = item_tree.top_level_attrs(self.db, self.def_map.krate); + if attrs.cfg().map_or(true, |cfg| self.cfg_options.check(&cfg) != Some(false)) { + // Process other crate-level attributes. + for attr in &*attrs { + let attr_name = match attr.path.as_ident() { + Some(name) => name, + None => continue, + }; + + let registered_name = if *attr_name == hir_expand::name![register_attr] + || *attr_name == hir_expand::name![register_tool] + { + match &attr.input { + Some(AttrInput::TokenTree(subtree)) => match &*subtree.token_trees { + [tt::TokenTree::Leaf(tt::Leaf::Ident(name))] => name.as_name(), + _ => continue, + }, + _ => continue, + } + } else { + continue; + }; + + if *attr_name == hir_expand::name![register_attr] { + self.registered_attrs.push(registered_name.to_string()); + cov_mark::hit!(register_attr); + } else { + self.registered_tools.push(registered_name.to_string()); + cov_mark::hit!(register_tool); + } + } + ModCollector { def_collector: &mut *self, macro_depth: 0, @@ -1479,30 +1513,6 @@ impl ModCollector<'_, '_> { /// If `ignore_up_to` is `Some`, attributes precending and including that attribute will be /// assumed to be resolved already. fn resolve_attributes(&mut self, attrs: &Attrs, mod_item: ModItem) -> Result<(), ()> { - fn is_builtin_attr(path: &ModPath) -> bool { - if path.kind == PathKind::Plain { - if let Some(tool_module) = path.segments().first() { - let tool_module = tool_module.to_string(); - if builtin_attr::TOOL_MODULES.iter().any(|m| tool_module == *m) { - return true; - } - } - - if let Some(name) = path.as_ident() { - let name = name.to_string(); - if builtin_attr::INERT_ATTRIBUTES - .iter() - .chain(builtin_attr::EXTRA_ATTRIBUTES) - .any(|attr| name == *attr) - { - return true; - } - } - } - - false - } - let mut ignore_up_to = self.def_collector.skip_attrs.get(&InFile::new(self.file_id, mod_item)).copied(); for attr in attrs.iter().skip_while(|attr| match ignore_up_to { @@ -1515,7 +1525,7 @@ impl ModCollector<'_, '_> { }) { if attr.path.as_ident() == Some(&hir_expand::name![derive]) { self.collect_derive(attr, mod_item); - } else if is_builtin_attr(&attr.path) { + } else if self.is_builtin_or_registered_attr(&attr.path) { continue; } else { log::debug!("non-builtin attribute {}", attr.path); @@ -1538,6 +1548,37 @@ impl ModCollector<'_, '_> { Ok(()) } + fn is_builtin_or_registered_attr(&self, path: &ModPath) -> bool { + if path.kind == PathKind::Plain { + if let Some(tool_module) = path.segments().first() { + let tool_module = tool_module.to_string(); + if builtin_attr::TOOL_MODULES + .iter() + .copied() + .chain(self.def_collector.registered_tools.iter().map(|s| &**s)) + .any(|m| tool_module == *m) + { + return true; + } + } + + if let Some(name) = path.as_ident() { + let name = name.to_string(); + if builtin_attr::INERT_ATTRIBUTES + .iter() + .chain(builtin_attr::EXTRA_ATTRIBUTES) + .copied() + .chain(self.def_collector.registered_attrs.iter().map(|s| &**s)) + .any(|attr| name == *attr) + { + return true; + } + } + } + + false + } + fn collect_derive(&mut self, attr: &Attr, mod_item: ModItem) { let ast_id: FileAstId = match mod_item { ModItem::Struct(it) => self.item_tree[it].ast_id.upcast(), @@ -1780,7 +1821,9 @@ mod tests { exports_proc_macros: false, from_glob_import: Default::default(), skip_attrs: Default::default(), - derive_helpers_in_scope: FxHashMap::default(), + derive_helpers_in_scope: Default::default(), + registered_attrs: Default::default(), + registered_tools: Default::default(), }; collector.seed_with_top_level(); collector.collect(); diff --git a/crates/hir_def/src/nameres/tests/diagnostics.rs b/crates/hir_def/src/nameres/tests/diagnostics.rs index 543975e07..75147d973 100644 --- a/crates/hir_def/src/nameres/tests/diagnostics.rs +++ b/crates/hir_def/src/nameres/tests/diagnostics.rs @@ -237,3 +237,20 @@ fn good_out_dir_diagnostic() { "#, ); } + +#[test] +fn register_attr_and_tool() { + cov_mark::check!(register_attr); + cov_mark::check!(register_tool); + check_no_diagnostics( + r#" +#![register_tool(tool)] +#![register_attr(attr)] + +#[tool::path] +#[attr] +struct S; + "#, + ); + // NB: we don't currently emit diagnostics here +} diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs index 5a5dc9afd..ef67ea2e9 100644 --- a/crates/hir_expand/src/name.rs +++ b/crates/hir_expand/src/name.rs @@ -164,6 +164,8 @@ pub mod known { doc, cfg, cfg_attr, + register_attr, + register_tool, // Components of known path (value or mod name) std, core, -- cgit v1.2.3