diff options
| author | bors <bors@rust-lang.org> | 2024-10-07 08:59:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-07 08:59:55 +0000 |
| commit | 0b16baa570d26224612ea27f76d68e4c6ca135cc (patch) | |
| tree | b13c5298bd7a87dd14be6a728dfbe0c7de7ce748 /compiler/rustc_expand/src/expand.rs | |
| parent | 690332a251329e603d1a38bc70a4f6a45ac30bc2 (diff) | |
| parent | fc64ff7ec2aad5261365c0cfc033f65140828eb2 (diff) | |
| download | rust-0b16baa570d26224612ea27f76d68e4c6ca135cc.tar.gz rust-0b16baa570d26224612ea27f76d68e4c6ca135cc.zip | |
Auto merge of #131235 - codemountains:rename-nestedmetaitem-to-metaitemlnner, r=nnethercote
Rename `NestedMetaItem` to `MetaItemInner` Fixes #131087 r? `@nnethercote`
Diffstat (limited to 'compiler/rustc_expand/src/expand.rs')
| -rw-r--r-- | compiler/rustc_expand/src/expand.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_expand/src/expand.rs b/compiler/rustc_expand/src/expand.rs index 079dcee99d3..a872b12e744 100644 --- a/compiler/rustc_expand/src/expand.rs +++ b/compiler/rustc_expand/src/expand.rs @@ -11,7 +11,7 @@ use rustc_ast::tokenstream::TokenStream; use rustc_ast::visit::{self, AssocCtxt, Visitor, VisitorResult, try_visit, walk_list}; use rustc_ast::{ AssocItemKind, AstNodeWrapper, AttrArgs, AttrStyle, AttrVec, ExprKind, ForeignItemKind, - HasAttrs, HasNodeId, Inline, ItemKind, MacStmtStyle, MetaItemKind, ModKind, NestedMetaItem, + HasAttrs, HasNodeId, Inline, ItemKind, MacStmtStyle, MetaItemInner, MetaItemKind, ModKind, NodeId, PatKind, StmtKind, TyKind, }; use rustc_ast_pretty::pprust; @@ -1863,8 +1863,8 @@ impl<'a, 'b> InvocationCollector<'a, 'b> { .iter() .filter(|a| a.has_name(sym::derive)) .flat_map(|a| a.meta_item_list().unwrap_or_default()) - .filter_map(|nested_meta| match nested_meta { - NestedMetaItem::MetaItem(ast::MetaItem { + .filter_map(|meta_item_inner| match meta_item_inner { + MetaItemInner::MetaItem(ast::MetaItem { kind: MetaItemKind::Word, path, .. |