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

expand: Move some more derive logic to rustc_builtin_macros

Browse source
This commit is contained in:
Vadim Petrochenkov 2021-06-20 18:10:02 +03:00
parent 75d1500f02
commit 3f0729f378
5 changed files with 13 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,8 @@ impl MultiItemModifier for Expander {
return ExpandResult::Ready(vec![item]);
}
let item = cfg_eval(ecx, item);
let result =
ecx.resolver.resolve_derives(ecx.current_expansion.id, ecx.force_mode, &|| {
let template =
@ -54,12 +56,12 @@ impl MultiItemModifier for Expander {
report_path_args(sess, &meta);
meta.path
})
.map(|path| (path, None))
.map(|path| (path, item.clone(), None))
.collect()
});
match result {
Ok(()) => ExpandResult::Ready(cfg_eval(ecx, item)),
Ok(()) => ExpandResult::Ready(vec![item]),
Err(Indeterminate) => ExpandResult::Retry(item),
}
}