bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_builtin_macros: Share some more logic between derive and cfg_eval

Browse source
This commit is contained in:
Vadim Petrochenkov 2021-03-07 01:11:21 +03:00
parent 10ed08f5b6
commit 5d27728141
2 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_builtin_macros/src/cfg_eval.rs
View file

@ -14,27 +14,30 @@ crate fn expand(
ecx: &mut ExtCtxt<'_>, ecx: &mut ExtCtxt<'_>,
_span: Span, _span: Span,
meta_item: &ast::MetaItem, meta_item: &ast::MetaItem,
item: Annotatable, annotatable: Annotatable,
) -> Vec<Annotatable> { ) -> Vec<Annotatable> {
check_builtin_macro_attribute(ecx, meta_item, sym::cfg_eval); check_builtin_macro_attribute(ecx, meta_item, sym::cfg_eval);
cfg_eval(ecx, annotatable)
}
crate fn cfg_eval(ecx: &ExtCtxt<'_>, annotatable: Annotatable) -> Vec<Annotatable> {
let mut visitor = CfgEval { let mut visitor = CfgEval {
cfg: StripUnconfigured { sess: ecx.sess, features: ecx.ecfg.features, modified: false }, cfg: StripUnconfigured { sess: ecx.sess, features: ecx.ecfg.features, modified: false },
}; };
let mut item = visitor.fully_configure(item); let mut annotatable = visitor.configure_annotatable(annotatable);
if visitor.cfg.modified { if visitor.cfg.modified {
// Erase the tokens if cfg-stripping modified the item // Erase the tokens if cfg-stripping modified the item
// This will cause us to synthesize fake tokens // This will cause us to synthesize fake tokens
// when `nt_to_tokenstream` is called on this item. // when `nt_to_tokenstream` is called on this item.
if let Some(tokens) = item.tokens_mut() { if let Some(tokens) = annotatable.tokens_mut() {
*tokens = None; *tokens = None;
} }
} }
vec![item] vec![annotatable]
} }
crate struct CfgEval<'a> { struct CfgEval<'a> {
pub cfg: StripUnconfigured<'a>, cfg: StripUnconfigured<'a>,
} }
impl CfgEval<'_> { impl CfgEval<'_> {
@ -42,10 +45,10 @@ impl CfgEval<'_> {
self.cfg.configure(node) self.cfg.configure(node)
} }
crate fn fully_configure(&mut self, item: Annotatable) -> Annotatable { fn configure_annotatable(&mut self, annotatable: Annotatable) -> Annotatable {
// Since the item itself has already been configured by the InvocationCollector, // Since the item itself has already been configured by the InvocationCollector,
// we know that fold result vector will contain exactly one element // we know that fold result vector will contain exactly one element
match item { match annotatable {
Annotatable::Item(item) => Annotatable::Item(self.flat_map_item(item).pop().unwrap()), Annotatable::Item(item) => Annotatable::Item(self.flat_map_item(item).pop().unwrap()),
Annotatable::TraitItem(item) => { Annotatable::TraitItem(item) => {
Annotatable::TraitItem(self.flat_map_trait_item(item).pop().unwrap()) Annotatable::TraitItem(self.flat_map_trait_item(item).pop().unwrap())

21
compiler/rustc_builtin_macros/src/derive.rs
View file

@ -1,9 +1,8 @@
use crate::cfg_eval::CfgEval; use crate::cfg_eval::cfg_eval;
use rustc_ast::{self as ast, token, AstLike, ItemKind, MetaItemKind, NestedMetaItem, StmtKind}; use rustc_ast::{self as ast, token, ItemKind, MetaItemKind, NestedMetaItem, StmtKind};
use rustc_errors::{struct_span_err, Applicability}; use rustc_errors::{struct_span_err, Applicability};
use rustc_expand::base::{Annotatable, ExpandResult, ExtCtxt, Indeterminate, MultiItemModifier}; use rustc_expand::base::{Annotatable, ExpandResult, ExtCtxt, Indeterminate, MultiItemModifier};
use rustc_expand::config::StripUnconfigured;
use rustc_feature::AttributeTemplate; use rustc_feature::AttributeTemplate;
use rustc_parse::validate_attr; use rustc_parse::validate_attr;
use rustc_session::Session; use rustc_session::Session;
@ -53,21 +52,7 @@ impl MultiItemModifier for Expander {
// FIXME: Try to cache intermediate results to avoid collecting same paths multiple times. // FIXME: Try to cache intermediate results to avoid collecting same paths multiple times.
match ecx.resolver.resolve_derives(ecx.current_expansion.id, derives, ecx.force_mode) { match ecx.resolver.resolve_derives(ecx.current_expansion.id, derives, ecx.force_mode) {
Ok(()) => { Ok(()) => ExpandResult::Ready(cfg_eval(ecx, item)),
let mut visitor = CfgEval {
cfg: StripUnconfigured { sess, features: ecx.ecfg.features, modified: false },
};
let mut item = visitor.fully_configure(item);
if visitor.cfg.modified {
// Erase the tokens if cfg-stripping modified the item
// This will cause us to synthesize fake tokens
// when `nt_to_tokenstream` is called on this item.
if let Some(tokens) = item.tokens_mut() {
*tokens = None;
}
}
ExpandResult::Ready(vec![item])
}
Err(Indeterminate) => ExpandResult::Retry(item), Err(Indeterminate) => ExpandResult::Retry(item),
} }
} }