diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-11-24 16:00:57 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-11-29 12:08:57 +1100 |
| commit | c9ae38c71e2838f1ac282803ddde47f21f4ca76e (patch) | |
| tree | b958e56a3adccd7d12f831c73691306ed4860904 /compiler/rustc_builtin_macros/src/derive.rs | |
| parent | 2585bcea0bc2a9c42a4be2c1eba5c61137f2b167 (diff) | |
| download | rust-c9ae38c71e2838f1ac282803ddde47f21f4ca76e.tar.gz rust-c9ae38c71e2838f1ac282803ddde47f21f4ca76e.zip | |
Avoid unnecessary `MetaItem`/`Attribute` conversions.
`check_builtin_attribute` calls `parse_meta` to convert an `Attribute` to a `MetaItem`, which it then checks. However, many callers of `check_builtin_attribute` start with a `MetaItem`, and then convert it to an `Attribute` by calling `cx.attribute(meta_item)`. This `MetaItem` to `Attribute` to `MetaItem` conversion is silly. This commit adds a new function `check_builtin_meta_item`, which can be called instead from these call sites. `check_builtin_attribute` also now calls it. The commit also renames `check_meta` as `check_attr` to better match its arguments.
Diffstat (limited to 'compiler/rustc_builtin_macros/src/derive.rs')
| -rw-r--r-- | compiler/rustc_builtin_macros/src/derive.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/rustc_builtin_macros/src/derive.rs b/compiler/rustc_builtin_macros/src/derive.rs index c8a2fca00e8..0358c0b1b5f 100644 --- a/compiler/rustc_builtin_macros/src/derive.rs +++ b/compiler/rustc_builtin_macros/src/derive.rs @@ -33,14 +33,15 @@ impl MultiItemModifier for Expander { ecx.resolver.resolve_derives(ecx.current_expansion.id, ecx.force_mode, &|| { let template = AttributeTemplate { list: Some("Trait1, Trait2, ..."), ..Default::default() }; - let attr = - attr::mk_attr_outer(&sess.parse_sess.attr_id_generator, meta_item.clone()); - validate_attr::check_builtin_attribute( + validate_attr::check_builtin_meta_item( &sess.parse_sess, - &attr, + &meta_item, + ast::AttrStyle::Outer, sym::derive, template, ); + let attr = + attr::mk_attr_outer(&sess.parse_sess.attr_id_generator, meta_item.clone()); let mut resolutions: Vec<_> = attr .meta_item_list() |
