bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Only use assign_id! for ast nodes that support attributes

Browse source
This commit is contained in:
Aaron Hill 2021-07-17 08:22:09 -05:00
parent d6e3c11101
commit 7ca089c6d2
No known key found for this signature in database
GPG key ID: B4087E510E98B164
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_expand/src/base.rs
View file

@ -29,6 +29,9 @@ use std::rc::Rc;
crate use rustc_span::hygiene::MacroKind; crate use rustc_span::hygiene::MacroKind;
// When adding new variants, make sure to
// adjust the `visit_*` / `flat_map_*` calls in `InvocationCollector`
// to use `assign_id!`
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum Annotatable { pub enum Annotatable {
Item(P<ast::Item>), Item(P<ast::Item>),

10
compiler/rustc_expand/src/expand.rs
View file

@ -1099,6 +1099,8 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
} }
/// Wraps a call to `noop_visit_*` / `noop_flat_map_*` /// Wraps a call to `noop_visit_*` / `noop_flat_map_*`
/// for an AST node that supports attributes
/// (see the `Annotatable` enum)
/// This method assigns a `NodeId`, and sets that `NodeId` /// This method assigns a `NodeId`, and sets that `NodeId`
/// as our current 'lint node id'. If a macro call is found /// as our current 'lint node id'. If a macro call is found
/// inside this AST node, we will use this AST node's `NodeId` /// inside this AST node, we will use this AST node's `NodeId`
@ -1269,9 +1271,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
fn visit_pat(&mut self, pat: &mut P<ast::Pat>) { fn visit_pat(&mut self, pat: &mut P<ast::Pat>) {
match pat.kind { match pat.kind {
PatKind::MacCall(_) => {} PatKind::MacCall(_) => {}
_ => { _ => return noop_visit_pat(pat, self),
return assign_id!(self, &mut pat.id, || noop_visit_pat(pat, self));
}
} }
visit_clobber(pat, |mut pat| match mem::replace(&mut pat.kind, PatKind::Wild) { visit_clobber(pat, |mut pat| match mem::replace(&mut pat.kind, PatKind::Wild) {
@ -1326,7 +1326,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
&mut self.cx.current_expansion.dir_ownership, &mut self.cx.current_expansion.dir_ownership,
DirOwnership::UnownedViaBlock, DirOwnership::UnownedViaBlock,
); );
assign_id!(self, &mut block.id, || noop_visit_block(block, self)); noop_visit_block(block, self);
self.cx.current_expansion.dir_ownership = orig_dir_ownership; self.cx.current_expansion.dir_ownership = orig_dir_ownership;
} }
@ -1498,7 +1498,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
fn visit_ty(&mut self, ty: &mut P<ast::Ty>) { fn visit_ty(&mut self, ty: &mut P<ast::Ty>) {
match ty.kind { match ty.kind {
ast::TyKind::MacCall(_) => {} ast::TyKind::MacCall(_) => {}
_ => return assign_id!(self, &mut ty.id, || noop_visit_ty(ty, self)), _ => return noop_visit_ty(ty, self),
}; };
visit_clobber(ty, |mut ty| match mem::replace(&mut ty.kind, ast::TyKind::Err) { visit_clobber(ty, |mut ty| match mem::replace(&mut ty.kind, ast::TyKind::Err) {