bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove NonMacroAttr.mark_used

Browse source
This commit is contained in:
Aaron Hill 2021-08-05 17:58:59 -05:00
parent af46699f81
commit 17aef21b30
No known key found for this signature in database
GPG key ID: B4087E510E98B164
4 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -654,10 +654,7 @@ pub enum SyntaxExtensionKind {
/// A trivial attribute "macro" that does nothing,
/// only keeps the attribute and marks it as inert,
/// thus making it ineligible for further expansion.
NonMacroAttr {
/// Suppresses the `unused_attributes` lint for this attribute.
mark_used: bool,
},
NonMacroAttr,
/// A token-based derive macro.
Derive(
@ -706,7 +703,7 @@ impl SyntaxExtension {
SyntaxExtensionKind::Bang(..) | SyntaxExtensionKind::LegacyBang(..) => MacroKind::Bang,
SyntaxExtensionKind::Attr(..)
| SyntaxExtensionKind::LegacyAttr(..)
| SyntaxExtensionKind::NonMacroAttr { .. } => MacroKind::Attr,
| SyntaxExtensionKind::NonMacroAttr => MacroKind::Attr,
SyntaxExtensionKind::Derive(..) | SyntaxExtensionKind::LegacyDerive(..) => {
MacroKind::Derive
}
@ -812,8 +809,8 @@ impl SyntaxExtension {
SyntaxExtension::default(SyntaxExtensionKind::Derive(Box::new(expander)), edition)
}
pub fn non_macro_attr(mark_used: bool, edition: Edition) -> SyntaxExtension {
SyntaxExtension::default(SyntaxExtensionKind::NonMacroAttr { mark_used }, edition)
pub fn non_macro_attr(edition: Edition) -> SyntaxExtension {
SyntaxExtension::default(SyntaxExtensionKind::NonMacroAttr, edition)
}
pub fn expn_data(

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

@ -753,7 +753,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
}
}
}
SyntaxExtensionKind::NonMacroAttr { mark_used: _ } => {
SyntaxExtensionKind::NonMacroAttr => {
self.cx.expanded_inert_attrs.mark(&attr);
item.visit_attrs(|attrs| attrs.insert(pos, attr));
fragment_kind.expect_from_annotatables(iter::once(item))