mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #14636 - Veykril:macros, r=Veykril

Browse Source 
internal: Remove unnecessary is_derive field from MacroCallKind::Attr
This commit is contained in:
bors 2023-04-24 06:13:18 +00:00
commit b2e6f3a9da
7 changed files with 75 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/hir-def/src/data.rs
View File

@ -623,7 +623,6 @@ fn collect(&mut self, item_tree: &ItemTree, tree_id: TreeId, assoc_items: &[Asso
ast_id, ast_id,
attr_args: Arc::new((tt::Subtree::empty(), Default::default())), attr_args: Arc::new((tt::Subtree::empty(), Default::default())),
invoc_attr_index: attr.id, invoc_attr_index: attr.id,
is_derive: false,
}, },
attr.path().clone(), attr.path().clone(),
)); ));

2
crates/hir-def/src/lib.rs
View File

@ -984,7 +984,6 @@ fn attr_macro_as_call_id(
macro_attr: &Attr, macro_attr: &Attr,
krate: CrateId, krate: CrateId,
def: MacroDefId, def: MacroDefId,
is_derive: bool,
) -> MacroCallId { ) -> MacroCallId {
let arg = match macro_attr.input.as_deref() { let arg = match macro_attr.input.as_deref() {
Some(AttrInput::TokenTree(tt, map)) => ( Some(AttrInput::TokenTree(tt, map)) => (
@ -1005,7 +1004,6 @@ fn attr_macro_as_call_id(
ast_id: item_attr.ast_id, ast_id: item_attr.ast_id,
attr_args: Arc::new(arg), attr_args: Arc::new(arg),
invoc_attr_index: macro_attr.id, invoc_attr_index: macro_attr.id,
is_derive,
}, },
) )
} }

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

@ -61,7 +61,6 @@ pub(crate) fn resolve_attr_macro(
attr, attr,
self.krate, self.krate,
macro_id_to_def_id(db, def), macro_id_to_def_id(db, def),
false,
))) )))
} }

12
crates/hir-def/src/nameres/collector.rs
View File

@ -481,7 +481,6 @@ fn reseed_with_unresolved_attribute(&mut self) -> ReachedFixedPoint {
Default::default(), Default::default(),
)), )),
invoc_attr_index: attr.id, invoc_attr_index: attr.id,
is_derive: false,
}, },
attr.path().clone(), attr.path().clone(),
)); ));
@ -1273,7 +1272,6 @@ fn resolve_macros(&mut self) -> ReachedFixedPoint {
attr, attr,
self.def_map.krate, self.def_map.krate,
def, def,
true,
); );
self.def_map.modules[directive.module_id] self.def_map.modules[directive.module_id]
.scope .scope
@ -1293,14 +1291,8 @@ fn resolve_macros(&mut self) -> ReachedFixedPoint {
} }
// Not resolved to a derive helper or the derive attribute, so try to treat as a normal attribute. // Not resolved to a derive helper or the derive attribute, so try to treat as a normal attribute.
let call_id = attr_macro_as_call_id( let call_id =
self.db, attr_macro_as_call_id(self.db, file_ast_id, attr, self.def_map.krate, def);
file_ast_id,
attr,
self.def_map.krate,
def,
false,
);
let loc: MacroCallLoc = self.db.lookup_intern_macro_call(call_id); let loc: MacroCallLoc = self.db.lookup_intern_macro_call(call_id);
// If proc attribute macro expansion is disabled, skip expanding it here // If proc attribute macro expansion is disabled, skip expanding it here

2
crates/hir-expand/src/builtin_attr_macro.rs
View File

@ -96,7 +96,7 @@ fn derive_attr_expand(
) -> ExpandResult<tt::Subtree> { ) -> ExpandResult<tt::Subtree> {
let loc = db.lookup_intern_macro_call(id); let loc = db.lookup_intern_macro_call(id);
let derives = match &loc.kind { let derives = match &loc.kind {
MacroCallKind::Attr { attr_args, is_derive: true, .. } => &attr_args.0, MacroCallKind::Attr { attr_args, .. } if loc.def.is_attribute_derive() => &attr_args.0,
_ => return ExpandResult::ok(tt::Subtree::empty()), _ => return ExpandResult::ok(tt::Subtree::empty()),
}; };
pseudo_derive_attr_expansion(tt, derives) pseudo_derive_attr_expansion(tt, derives)

17
crates/hir-expand/src/db.rs
View File

@ -172,8 +172,8 @@ pub fn expand_speculative(
); );
let (attr_arg, token_id) = match loc.kind { let (attr_arg, token_id) = match loc.kind {
MacroCallKind::Attr { invoc_attr_index, is_derive, .. } => { MacroCallKind::Attr { invoc_attr_index, .. } => {
let attr = if is_derive { let attr = if loc.def.is_attribute_derive() {
// for pseudo-derive expansion we actually pass the attribute itself only // for pseudo-derive expansion we actually pass the attribute itself only
ast::Attr::cast(speculative_args.clone()) ast::Attr::cast(speculative_args.clone())
} else { } else {
@ -285,8 +285,8 @@ fn parse_macro_expansion(
// Note: // Note:
// The final goal we would like to make all parse_macro success, // The final goal we would like to make all parse_macro success,
// such that the following log will not call anyway. // such that the following log will not call anyway.
let loc: MacroCallLoc = db.lookup_intern_macro_call(macro_file.macro_call_id); let loc = db.lookup_intern_macro_call(macro_file.macro_call_id);
let node = loc.kind.to_node(db); let node = loc.to_node(db);
// collect parent information for warning log // collect parent information for warning log
let parents = std::iter::successors(loc.kind.file_id().call_node(db), |it| { let parents = std::iter::successors(loc.kind.file_id().call_node(db), |it| {
@ -360,7 +360,7 @@ fn censor_for_macro_input(loc: &MacroCallLoc, node: &SyntaxNode) -> FxHashSet<Sy
.map(|it| it.syntax().clone()) .map(|it| it.syntax().clone())
.collect() .collect()
} }
MacroCallKind::Attr { is_derive: true, .. } => return None, MacroCallKind::Attr { .. } if loc.def.is_attribute_derive() => return None,
MacroCallKind::Attr { invoc_attr_index, .. } => { MacroCallKind::Attr { invoc_attr_index, .. } => {
cov_mark::hit!(attribute_macro_attr_censoring); cov_mark::hit!(attribute_macro_attr_censoring);
ast::Item::cast(node.clone())? ast::Item::cast(node.clone())?
@ -442,7 +442,7 @@ fn macro_def(
fn macro_expand(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandResult<Arc<tt::Subtree>> { fn macro_expand(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandResult<Arc<tt::Subtree>> {
let _p = profile::span("macro_expand"); let _p = profile::span("macro_expand");
let loc: MacroCallLoc = db.lookup_intern_macro_call(id); let loc = db.lookup_intern_macro_call(id);
if let Some(eager) = &loc.eager { if let Some(eager) = &loc.eager {
return ExpandResult { value: eager.arg_or_expansion.clone(), err: eager.error.clone() }; return ExpandResult { value: eager.arg_or_expansion.clone(), err: eager.error.clone() };
} }
@ -511,7 +511,7 @@ fn parse_macro_expansion_error(
} }
fn expand_proc_macro(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandResult<tt::Subtree> { fn expand_proc_macro(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandResult<tt::Subtree> {
let loc: MacroCallLoc = db.lookup_intern_macro_call(id); let loc = db.lookup_intern_macro_call(id);
let Some(macro_arg) = db.macro_arg(id) else { let Some(macro_arg) = db.macro_arg(id) else {
return ExpandResult { return ExpandResult {
value: tt::Subtree { value: tt::Subtree {
@ -547,8 +547,7 @@ fn hygiene_frame(db: &dyn ExpandDatabase, file_id: HirFileId) -> Arc<HygieneFram
} }
fn macro_expand_to(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandTo { fn macro_expand_to(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandTo {
let loc: MacroCallLoc = db.lookup_intern_macro_call(id); db.lookup_intern_macro_call(id).expand_to()
loc.kind.expand_to()
} }
fn token_tree_to_syntax_node( fn token_tree_to_syntax_node(

119
crates/hir-expand/src/lib.rs
View File

@ -168,8 +168,6 @@ pub enum MacroCallKind {
/// Outer attributes are counted first, then inner attributes. This does not support /// Outer attributes are counted first, then inner attributes. This does not support
/// out-of-line modules, which may have attributes spread across 2 files! /// out-of-line modules, which may have attributes spread across 2 files!
invoc_attr_index: AttrId, invoc_attr_index: AttrId,
/// Whether this attribute is the `#[derive]` attribute.
is_derive: bool,
}, },
} }
@ -232,18 +230,17 @@ pub fn expansion_level(self, db: &dyn db::ExpandDatabase) -> u32 {
pub fn call_node(self, db: &dyn db::ExpandDatabase) -> Option<InFile<SyntaxNode>> { pub fn call_node(self, db: &dyn db::ExpandDatabase) -> Option<InFile<SyntaxNode>> {
let macro_file = self.macro_file()?; let macro_file = self.macro_file()?;
let loc: MacroCallLoc = db.lookup_intern_macro_call(macro_file.macro_call_id); let loc: MacroCallLoc = db.lookup_intern_macro_call(macro_file.macro_call_id);
Some(loc.kind.to_node(db)) Some(loc.to_node(db))
} }
/// If this is a macro call, returns the syntax node of the very first macro call this file resides in. /// If this is a macro call, returns the syntax node of the very first macro call this file resides in.
pub fn original_call_node(self, db: &dyn db::ExpandDatabase) -> Option<(FileId, SyntaxNode)> { pub fn original_call_node(self, db: &dyn db::ExpandDatabase) -> Option<(FileId, SyntaxNode)> {
let mut call = let mut call = db.lookup_intern_macro_call(self.macro_file()?.macro_call_id).to_node(db);
db.lookup_intern_macro_call(self.macro_file()?.macro_call_id).kind.to_node(db);
loop { loop {
match call.file_id.repr() { match call.file_id.repr() {
HirFileIdRepr::FileId(file_id) => break Some((file_id, call.value)), HirFileIdRepr::FileId(file_id) => break Some((file_id, call.value)),
HirFileIdRepr::MacroFile(MacroFile { macro_call_id }) => { HirFileIdRepr::MacroFile(MacroFile { macro_call_id }) => {
call = db.lookup_intern_macro_call(macro_call_id).kind.to_node(db); call = db.lookup_intern_macro_call(macro_call_id).to_node(db);
} }
} }
} }
@ -306,7 +303,7 @@ pub fn is_builtin_derive(&self, db: &dyn db::ExpandDatabase) -> Option<InFile<as
let macro_file = self.macro_file()?; let macro_file = self.macro_file()?;
let loc: MacroCallLoc = db.lookup_intern_macro_call(macro_file.macro_call_id); let loc: MacroCallLoc = db.lookup_intern_macro_call(macro_file.macro_call_id);
let attr = match loc.def.kind { let attr = match loc.def.kind {
MacroDefKind::BuiltInDerive(..) => loc.kind.to_node(db), MacroDefKind::BuiltInDerive(..) => loc.to_node(db),
_ => return None, _ => return None,
}; };
Some(attr.with_value(ast::Attr::cast(attr.value.clone())?)) Some(attr.with_value(ast::Attr::cast(attr.value.clone())?))
@ -350,7 +347,7 @@ pub fn is_derive_attr_pseudo_expansion(&self, db: &dyn db::ExpandDatabase) -> bo
match self.macro_file() { match self.macro_file() {
Some(macro_file) => { Some(macro_file) => {
let loc: MacroCallLoc = db.lookup_intern_macro_call(macro_file.macro_call_id); let loc: MacroCallLoc = db.lookup_intern_macro_call(macro_file.macro_call_id);
matches!(loc.kind, MacroCallKind::Attr { is_derive: true, .. }) loc.def.is_attribute_derive()
} }
None => false, None => false,
} }
@ -421,22 +418,15 @@ pub fn is_attribute(&self) -> bool {
MacroDefKind::BuiltInAttr(..) | MacroDefKind::ProcMacro(_, ProcMacroKind::Attr, _) MacroDefKind::BuiltInAttr(..) | MacroDefKind::ProcMacro(_, ProcMacroKind::Attr, _)
) )
} }
pub fn is_attribute_derive(&self) -> bool {
matches!(self.kind, MacroDefKind::BuiltInAttr(expander, ..) if expander.is_derive())
}
} }
// FIXME: attribute indices do not account for nested `cfg_attr` impl MacroCallLoc {
impl MacroCallKind {
/// Returns the file containing the macro invocation.
fn file_id(&self) -> HirFileId {
match *self {
MacroCallKind::FnLike { ast_id: InFile { file_id, .. }, .. }
| MacroCallKind::Derive { ast_id: InFile { file_id, .. }, .. }
| MacroCallKind::Attr { ast_id: InFile { file_id, .. }, .. } => file_id,
}
}
pub fn to_node(&self, db: &dyn db::ExpandDatabase) -> InFile<SyntaxNode> { pub fn to_node(&self, db: &dyn db::ExpandDatabase) -> InFile<SyntaxNode> {
match self { match self.kind {
MacroCallKind::FnLike { ast_id, .. } => { MacroCallKind::FnLike { ast_id, .. } => {
ast_id.with_value(ast_id.to_node(db).syntax().clone()) ast_id.with_value(ast_id.to_node(db).syntax().clone())
} }
@ -452,23 +442,49 @@ pub fn to_node(&self, db: &dyn db::ExpandDatabase) -> InFile<SyntaxNode> {
.unwrap_or_else(|| it.syntax().clone()) .unwrap_or_else(|| it.syntax().clone())
}) })
} }
MacroCallKind::Attr { ast_id, is_derive: true, invoc_attr_index, .. } => { MacroCallKind::Attr { ast_id, invoc_attr_index, .. } => {
// FIXME: handle `cfg_attr` if self.def.is_attribute_derive() {
ast_id.with_value(ast_id.to_node(db)).map(|it| { // FIXME: handle `cfg_attr`
it.doc_comments_and_attrs() ast_id.with_value(ast_id.to_node(db)).map(|it| {
.nth(invoc_attr_index.ast_index()) it.doc_comments_and_attrs()
.and_then(|it| match it { .nth(invoc_attr_index.ast_index())
Either::Left(attr) => Some(attr.syntax().clone()), .and_then(|it| match it {
Either::Right(_) => None, Either::Left(attr) => Some(attr.syntax().clone()),
}) Either::Right(_) => None,
.unwrap_or_else(|| it.syntax().clone()) })
}) .unwrap_or_else(|| it.syntax().clone())
})
} else {
ast_id.with_value(ast_id.to_node(db).syntax().clone())
}
} }
MacroCallKind::Attr { ast_id, .. } => { }
ast_id.with_value(ast_id.to_node(db).syntax().clone()) }
fn expand_to(&self) -> ExpandTo {
match self.kind {
MacroCallKind::FnLike { expand_to, .. } => expand_to,
MacroCallKind::Derive { .. } => ExpandTo::Items,
MacroCallKind::Attr { .. } if self.def.is_attribute_derive() => ExpandTo::Statements,
MacroCallKind::Attr { .. } => {
// is this always correct?
ExpandTo::Items
} }
} }
} }
}
// FIXME: attribute indices do not account for nested `cfg_attr`
impl MacroCallKind {
/// Returns the file containing the macro invocation.
fn file_id(&self) -> HirFileId {
match *self {
MacroCallKind::FnLike { ast_id: InFile { file_id, .. }, .. }
| MacroCallKind::Derive { ast_id: InFile { file_id, .. }, .. }
| MacroCallKind::Attr { ast_id: InFile { file_id, .. }, .. } => file_id,
}
}
/// Returns the original file range that best describes the location of this macro call. /// Returns the original file range that best describes the location of this macro call.
/// ///
@ -546,15 +562,6 @@ fn arg(&self, db: &dyn db::ExpandDatabase) -> Option<SyntaxNode> {
MacroCallKind::Attr { ast_id, .. } => Some(ast_id.to_node(db).syntax().clone()), MacroCallKind::Attr { ast_id, .. } => Some(ast_id.to_node(db).syntax().clone()),
} }
} }
fn expand_to(&self) -> ExpandTo {
match self {
MacroCallKind::FnLike { expand_to, .. } => *expand_to,
MacroCallKind::Derive { .. } => ExpandTo::Items,
MacroCallKind::Attr { is_derive: true, .. } => ExpandTo::Statements,
MacroCallKind::Attr { .. } => ExpandTo::Items, // is this always correct?
}
}
} }
impl MacroCallId { impl MacroCallId {
@ -618,7 +625,7 @@ pub fn map_token_down(
let token_range = token.value.text_range(); let token_range = token.value.text_range();
match &loc.kind { match &loc.kind {
MacroCallKind::Attr { attr_args, invoc_attr_index, is_derive, .. } => { MacroCallKind::Attr { attr_args, invoc_attr_index, .. } => {
// FIXME: handle `cfg_attr` // FIXME: handle `cfg_attr`
let attr = item let attr = item
.doc_comments_and_attrs() .doc_comments_and_attrs()
@ -634,7 +641,8 @@ pub fn map_token_down(
token.value.text_range().checked_sub(attr_input_start)?; token.value.text_range().checked_sub(attr_input_start)?;
// shift by the item's tree's max id // shift by the item's tree's max id
let token_id = attr_args.1.token_by_range(relative_range)?; let token_id = attr_args.1.token_by_range(relative_range)?;
let token_id = if *is_derive {
let token_id = if loc.def.is_attribute_derive() {
// we do not shift for `#[derive]`, as we only need to downmap the derive attribute tokens // we do not shift for `#[derive]`, as we only need to downmap the derive attribute tokens
token_id token_id
} else { } else {
@ -697,18 +705,19 @@ pub fn map_token_up(
// Attributes are a bit special for us, they have two inputs, the input tokentree and the annotated item. // Attributes are a bit special for us, they have two inputs, the input tokentree and the annotated item.
let (token_map, tt) = match &loc.kind { let (token_map, tt) = match &loc.kind {
MacroCallKind::Attr { attr_args, is_derive: true, .. } => {
(&attr_args.1, self.attr_input_or_mac_def.clone()?.syntax().cloned())
}
MacroCallKind::Attr { attr_args, .. } => { MacroCallKind::Attr { attr_args, .. } => {
// try unshifting the token id, if unshifting fails, the token resides in the non-item attribute input if loc.def.is_attribute_derive() {
// note that the `TokenExpander::map_id_up` earlier only unshifts for declarative macros, so we don't double unshift with this (&attr_args.1, self.attr_input_or_mac_def.clone()?.syntax().cloned())
match self.macro_arg_shift.unshift(token_id) { } else {
Some(unshifted) => { // try unshifting the token id, if unshifting fails, the token resides in the non-item attribute input
token_id = unshifted; // note that the `TokenExpander::map_id_up` earlier only unshifts for declarative macros, so we don't double unshift with this
(&attr_args.1, self.attr_input_or_mac_def.clone()?.syntax().cloned()) match self.macro_arg_shift.unshift(token_id) {
Some(unshifted) => {
token_id = unshifted;
(&attr_args.1, self.attr_input_or_mac_def.clone()?.syntax().cloned())
}
None => (&self.macro_arg.1, self.arg.clone()),
} }
None => (&self.macro_arg.1, self.arg.clone()),
} }
} }
_ => match origin { _ => match origin {