bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rename known_attrs to expanded_inert_attrs and move to rustc_expand

Browse source 
There's no need for this to be (untracked) global state.
This commit is contained in:
Aaron Hill 2021-07-22 17:40:01 -05:00
parent 4a1f419e64
commit a2ae191295
No known key found for this signature in database
GPG key ID: B4087E510E98B164
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -754,7 +754,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
}
}
SyntaxExtensionKind::NonMacroAttr { mark_used } => {
self.cx.sess.mark_attr_known(&attr);
self.cx.expanded_inert_attrs.mark(&attr);
if *mark_used {
self.cx.sess.mark_attr_used(&attr);
}
@ -1040,7 +1040,7 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
item.visit_attrs(|attrs| {
attr = attrs
.iter()
.position(|a| !self.cx.sess.is_attr_known(a) && !is_builtin_attr(a))
.position(|a| !self.cx.expanded_inert_attrs.is_marked(a) && !is_builtin_attr(a))
.map(|attr_pos| {
let attr = attrs.remove(attr_pos);
let following_derives = attrs[attr_pos..]