Skip to content

Commit 59c3a3a

Browse files
borsbors
committed
Auto merge of #17341 - Veykril:inert-attr, r=Veykril
internal: Cleanup some inert attribute stuff
2 parents 33a9021 + 211af03 commit 59c3a3a

File tree

17 files changed

+155
-162
lines changed

17 files changed

+155
-162
lines changed

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

+52-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
//! A higher level attributes based on TokenTree, with also some shortcuts.
22
3-
pub mod builtin;
4-
5-
#[cfg(test)]
6-
mod tests;
7-
83
use std::{borrow::Cow, hash::Hash, ops, slice::Iter as SliceIter};
94

105
use base_db::CrateId;
@@ -646,3 +641,55 @@ pub(crate) fn fields_attrs_source_map(
646641

647642
Arc::new(res)
648643
}
644+
645+
#[cfg(test)]
646+
mod tests {
647+
//! This module contains tests for doc-expression parsing.
648+
//! Currently, it tests `#[doc(hidden)]` and `#[doc(alias)]`.
649+
650+
use triomphe::Arc;
651+
652+
use base_db::FileId;
653+
use hir_expand::span_map::{RealSpanMap, SpanMap};
654+
use mbe::{syntax_node_to_token_tree, DocCommentDesugarMode};
655+
use syntax::{ast, AstNode, TextRange};
656+
657+
use crate::attr::{DocAtom, DocExpr};
658+
659+
fn assert_parse_result(input: &str, expected: DocExpr) {
660+
let source_file = ast::SourceFile::parse(input, span::Edition::CURRENT).ok().unwrap();
661+
let tt = source_file.syntax().descendants().find_map(ast::TokenTree::cast).unwrap();
662+
let map = SpanMap::RealSpanMap(Arc::new(RealSpanMap::absolute(FileId::from_raw(0))));
663+
let tt = syntax_node_to_token_tree(
664+
tt.syntax(),
665+
map.as_ref(),
666+
map.span_for_range(TextRange::empty(0.into())),
667+
DocCommentDesugarMode::ProcMacro,
668+
);
669+
let cfg = DocExpr::parse(&tt);
670+
assert_eq!(cfg, expected);
671+
}
672+
673+
#[test]
674+
fn test_doc_expr_parser() {
675+
assert_parse_result("#![doc(hidden)]", DocAtom::Flag("hidden".into()).into());
676+
677+
assert_parse_result(
678+
r#"#![doc(alias = "foo")]"#,
679+
DocAtom::KeyValue { key: "alias".into(), value: "foo".into() }.into(),
680+
);
681+
682+
assert_parse_result(r#"#![doc(alias("foo"))]"#, DocExpr::Alias(["foo".into()].into()));
683+
assert_parse_result(
684+
r#"#![doc(alias("foo", "bar", "baz"))]"#,
685+
DocExpr::Alias(["foo".into(), "bar".into(), "baz".into()].into()),
686+
);
687+
688+
assert_parse_result(
689+
r#"
690+
#[doc(alias("Bar", "Qux"))]
691+
struct Foo;"#,
692+
DocExpr::Alias(["Bar".into(), "Qux".into()].into()),
693+
);
694+
}
695+
}

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

-48
This file was deleted.

‎src/tools/rust-analyzer/crates/hir-def/src/data.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ impl<'a> AssocItemCollector<'a> {
642642
continue 'attrs;
643643
}
644644
let loc = self.db.lookup_intern_macro_call(call_id);
645-
if let MacroDefKind::ProcMacro(exp, ..) = loc.def.kind {
645+
if let MacroDefKind::ProcMacro(_, exp, _) = loc.def.kind {
646646
// If there's no expander for the proc macro (e.g. the
647647
// proc macro is ignored, or building the proc macro
648648
// crate failed), skip expansion like we would if it was

‎src/tools/rust-analyzer/crates/hir-def/src/db.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ fn macro_def(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
294294
let in_file = InFile::new(file_id, m);
295295
match expander {
296296
MacroExpander::Declarative => MacroDefKind::Declarative(in_file),
297-
MacroExpander::BuiltIn(it) => MacroDefKind::BuiltIn(it, in_file),
298-
MacroExpander::BuiltInAttr(it) => MacroDefKind::BuiltInAttr(it, in_file),
299-
MacroExpander::BuiltInDerive(it) => MacroDefKind::BuiltInDerive(it, in_file),
300-
MacroExpander::BuiltInEager(it) => MacroDefKind::BuiltInEager(it, in_file),
297+
MacroExpander::BuiltIn(it) => MacroDefKind::BuiltIn(in_file, it),
298+
MacroExpander::BuiltInAttr(it) => MacroDefKind::BuiltInAttr(in_file, it),
299+
MacroExpander::BuiltInDerive(it) => MacroDefKind::BuiltInDerive(in_file, it),
300+
MacroExpander::BuiltInEager(it) => MacroDefKind::BuiltInEager(in_file, it),
301301
}
302302
};
303303

@@ -338,9 +338,9 @@ fn macro_def(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
338338
MacroDefId {
339339
krate: loc.container.krate,
340340
kind: MacroDefKind::ProcMacro(
341+
InFile::new(loc.id.file_id(), makro.ast_id),
341342
loc.expander,
342343
loc.kind,
343-
InFile::new(loc.id.file_id(), makro.ast_id),
344344
),
345345
local_inner: false,
346346
allow_internal_unsafe: false,

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

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
use base_db::CrateId;
44
use hir_expand::{
55
attrs::{Attr, AttrId, AttrInput},
6+
inert_attr_macro::find_builtin_attr_idx,
67
MacroCallId, MacroCallKind, MacroDefId,
78
};
89
use span::SyntaxContextId;
910
use syntax::{ast, SmolStr};
1011
use triomphe::Arc;
1112

1213
use crate::{
13-
attr::builtin::find_builtin_attr_idx,
1414
db::DefDatabase,
1515
item_scope::BuiltinShadowMode,
1616
nameres::path_resolution::ResolveMode,
@@ -89,9 +89,12 @@ impl DefMap {
8989
}
9090

9191
if segments.len() == 1 {
92-
let mut registered = self.data.registered_attrs.iter().map(SmolStr::as_str);
93-
let is_inert = find_builtin_attr_idx(&name).is_some() || registered.any(pred);
94-
return is_inert;
92+
if find_builtin_attr_idx(&name).is_some() {
93+
return true;
94+
}
95+
if self.data.registered_attrs.iter().map(SmolStr::as_str).any(pred) {
96+
return true;
97+
}
9598
}
9699
}
97100
false

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

+22-30
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use cfg::{CfgExpr, CfgOptions};
1010
use either::Either;
1111
use hir_expand::{
1212
attrs::{Attr, AttrId},
13-
builtin_attr_macro::{find_builtin_attr, BuiltinAttrExpander},
13+
builtin_attr_macro::find_builtin_attr,
1414
builtin_derive_macro::find_builtin_derive,
1515
builtin_fn_macro::find_builtin_macro,
1616
name::{name, AsName, Name},
@@ -270,6 +270,7 @@ struct DefCollector<'a> {
270270
///
271271
/// This also stores the attributes to skip when we resolve derive helpers and non-macro
272272
/// non-builtin attributes in general.
273+
// FIXME: There has to be a better way to do this
273274
skip_attrs: FxHashMap<InFile<ModItem>, AttrId>,
274275
}
275276

@@ -1255,17 +1256,23 @@ impl DefCollector<'_> {
12551256
_ => return Resolved::No,
12561257
};
12571258

1258-
let call_id =
1259-
attr_macro_as_call_id(self.db, file_ast_id, attr, self.def_map.krate, def);
1260-
if let MacroDefId {
1261-
kind:
1262-
MacroDefKind::BuiltInAttr(
1263-
BuiltinAttrExpander::Derive | BuiltinAttrExpander::DeriveConst,
1264-
_,
1265-
),
1266-
..
1267-
} = def
1268-
{
1259+
// Skip #[test]/#[bench] expansion, which would merely result in more memory usage
1260+
// due to duplicating functions into macro expansions
1261+
if matches!(
1262+
def.kind,
1263+
MacroDefKind::BuiltInAttr(_, expander)
1264+
if expander.is_test() || expander.is_bench()
1265+
) {
1266+
return recollect_without(self);
1267+
}
1268+
1269+
let call_id = || {
1270+
attr_macro_as_call_id(self.db, file_ast_id, attr, self.def_map.krate, def)
1271+
};
1272+
if matches!(def,
1273+
MacroDefId { kind: MacroDefKind::BuiltInAttr(_, exp), .. }
1274+
if exp.is_derive()
1275+
) {
12691276
// Resolved to `#[derive]`, we don't actually expand this attribute like
12701277
// normal (as that would just be an identity expansion with extra output)
12711278
// Instead we treat derive attributes special and apply them separately.
@@ -1290,6 +1297,7 @@ impl DefCollector<'_> {
12901297

12911298
match attr.parse_path_comma_token_tree(self.db.upcast()) {
12921299
Some(derive_macros) => {
1300+
let call_id = call_id();
12931301
let mut len = 0;
12941302
for (idx, (path, call_site)) in derive_macros.enumerate() {
12951303
let ast_id = AstIdWithPath::new(file_id, ast_id.value, path);
@@ -1312,13 +1320,6 @@ impl DefCollector<'_> {
13121320
// This is just a trick to be able to resolve the input to derives
13131321
// as proper paths in `Semantics`.
13141322
// Check the comment in [`builtin_attr_macro`].
1315-
let call_id = attr_macro_as_call_id(
1316-
self.db,
1317-
file_ast_id,
1318-
attr,
1319-
self.def_map.krate,
1320-
def,
1321-
);
13221323
self.def_map.modules[directive.module_id]
13231324
.scope
13241325
.init_derive_attribute(ast_id, attr.id, call_id, len + 1);
@@ -1336,17 +1337,8 @@ impl DefCollector<'_> {
13361337
return recollect_without(self);
13371338
}
13381339

1339-
// Skip #[test]/#[bench] expansion, which would merely result in more memory usage
1340-
// due to duplicating functions into macro expansions
1341-
if matches!(
1342-
def.kind,
1343-
MacroDefKind::BuiltInAttr(expander, _)
1344-
if expander.is_test() || expander.is_bench()
1345-
) {
1346-
return recollect_without(self);
1347-
}
1348-
1349-
if let MacroDefKind::ProcMacro(exp, ..) = def.kind {
1340+
let call_id = call_id();
1341+
if let MacroDefKind::ProcMacro(_, exp, _) = def.kind {
13501342
// If proc attribute macro expansion is disabled, skip expanding it here
13511343
if !self.db.expand_proc_attr_macros() {
13521344
self.def_map.diagnostics.push(DefDiagnostic::unresolved_proc_macro(

‎src/tools/rust-analyzer/crates/hir-expand/src/builtin_attr_macro.rs

-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ impl BuiltinAttrExpander {
5252

5353
register_builtin! {
5454
(bench, Bench) => dummy_attr_expand,
55-
(cfg, Cfg) => dummy_attr_expand,
56-
(cfg_attr, CfgAttr) => dummy_attr_expand,
5755
(cfg_accessible, CfgAccessible) => dummy_attr_expand,
5856
(cfg_eval, CfgEval) => dummy_attr_expand,
5957
(derive, Derive) => derive_expand,

‎src/tools/rust-analyzer/crates/hir-expand/src/cfg_process.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ pub(crate) fn process_cfg_attrs(
189189
// FIXME: #[cfg_eval] is not implemented. But it is not stable yet
190190
let is_derive = match loc.def.kind {
191191
MacroDefKind::BuiltInDerive(..)
192-
| MacroDefKind::ProcMacro(_, ProcMacroKind::CustomDerive, _) => true,
193-
MacroDefKind::BuiltInAttr(expander, _) => expander.is_derive(),
192+
| MacroDefKind::ProcMacro(_, _, ProcMacroKind::CustomDerive) => true,
193+
MacroDefKind::BuiltInAttr(_, expander) => expander.is_derive(),
194194
_ => false,
195195
};
196196
if !is_derive {

0 commit comments

Comments
 (0)