Rename NestedMetaItem to MetaItemInner

Author: codemountains

compiler/rustc_ast/src/ast.rs

@@ -511,7 +511,7 @@ pub enum MetaItemKind {
 /// List meta item.
 ///
 /// E.g., `#[derive(..)]`, where the field represents the `..`.
-List(ThinVec<NestedMetaItem>),
+List(ThinVec<MetaItemInner>),
 
 /// Name value meta item.
 ///
@@ -523,7 +523,7 @@ pub enum MetaItemKind {
 ///
 /// E.g., each of `Clone`, `Copy` in `#[derive(Clone, Copy)]`.
 #[derive(Clone,Encodable,Decodable,Debug,HashStable_Generic)]
-pubenumNestedMetaItem{
+pubenumMetaItemInner{
 /// A full MetaItem, for recursive meta items.
 MetaItem(MetaItem),
 

compiler/rustc_ast/src/attr/mod.rs

@@ -11,7 +11,7 @@ use thin_vec::{ThinVec, thin_vec};
 
 usecrate::ast::{
 AttrArgs,AttrArgsEq,AttrId,AttrItem,AttrKind,AttrStyle,AttrVec,Attribute,DUMMY_NODE_ID,
-DelimArgs,Expr,ExprKind,LitKind,MetaItem,MetaItemKind,MetaItemLit,NestedMetaItem,
+DelimArgs,Expr,ExprKind,LitKind,MetaItem,MetaItemInner,MetaItemKind,MetaItemLit,
 NormalAttr,Path,PathSegment,Safety,
 };
 usecrate::ptr::P;
@@ -136,7 +136,7 @@ impl Attribute {
 }
 }
 
-pubfnmeta_item_list(&self) -> Option<ThinVec<NestedMetaItem>>{
+pubfnmeta_item_list(&self) -> Option<ThinVec<MetaItemInner>>{
 match&self.kind{
 AttrKind::Normal(normal) => normal.item.meta_item_list(),
 AttrKind::DocComment(..) => None,
@@ -223,7 +223,7 @@ impl AttrItem {
 self.args.span().map_or(self.path.span, |args_span| self.path.span.to(args_span))
 }
 
-fnmeta_item_list(&self) -> Option<ThinVec<NestedMetaItem>>{
+fnmeta_item_list(&self) -> Option<ThinVec<MetaItemInner>>{
 match&self.args{
 AttrArgs::Delimited(args)if args.delim == Delimiter::Parenthesis => {
 MetaItemKind::list_from_tokens(args.tokens.clone())
@@ -285,7 +285,7 @@ impl MetaItem {
 matches!(self.kind,MetaItemKind::Word)
 }
 
-pubfnmeta_item_list(&self) -> Option<&[NestedMetaItem]>{
+pubfnmeta_item_list(&self) -> Option<&[MetaItemInner]>{
 match&self.kind{
 MetaItemKind::List(l) => Some(&**l),
  _ => None,
@@ -393,11 +393,11 @@ impl MetaItem {
 }
 
 implMetaItemKind{
-fnlist_from_tokens(tokens:TokenStream) -> Option<ThinVec<NestedMetaItem>>{
+fnlist_from_tokens(tokens:TokenStream) -> Option<ThinVec<MetaItemInner>>{
 letmut tokens = tokens.trees().peekable();
 letmut result = ThinVec::new();
 while tokens.peek().is_some(){
-let item = NestedMetaItem::from_tokens(&mut tokens)?;
+let item = MetaItemInner::from_tokens(&mut tokens)?;
  result.push(item);
 match tokens.next(){
 None | Some(TokenTree::Token(Token{kind: token::Comma, .. }, _)) => {}
@@ -460,11 +460,11 @@ impl MetaItemKind {
 }
 }
 
-implNestedMetaItem{
+implMetaItemInner{
 pubfnspan(&self) -> Span{
 matchself{
-NestedMetaItem::MetaItem(item) => item.span,
-NestedMetaItem::Lit(lit) => lit.span,
+MetaItemInner::MetaItem(item) => item.span,
+MetaItemInner::Lit(lit) => lit.span,
 }
 }
 
@@ -488,7 +488,7 @@ impl NestedMetaItem {
 }
 
 /// Gets a list of inner meta items from a list `MetaItem` type.
-pubfnmeta_item_list(&self) -> Option<&[NestedMetaItem]>{
+pubfnmeta_item_list(&self) -> Option<&[MetaItemInner]>{
 self.meta_item().and_then(|meta_item| meta_item.meta_item_list())
 }
 
@@ -519,28 +519,28 @@ impl NestedMetaItem {
 self.meta_item().and_then(|meta_item| meta_item.value_str())
 }
 
-/// Returns the `MetaItemLit` if `self` is a `NestedMetaItem::Literal`s.
+/// Returns the `MetaItemLit` if `self` is a `MetaItemInner::Literal`s.
 pubfnlit(&self) -> Option<&MetaItemLit>{
 matchself{
-NestedMetaItem::Lit(lit) => Some(lit),
+MetaItemInner::Lit(lit) => Some(lit),
  _ => None,
 }
 }
 
-/// Returns the `MetaItem` if `self` is a `NestedMetaItem::MetaItem` or if it's
-/// `NestedMetaItem::Lit(MetaItemLit { kind: LitKind::Bool(_), .. })`.
-pubfnmeta_item_or_bool(&self) -> Option<&NestedMetaItem>{
+/// Returns the `MetaItem` if `self` is a `MetaItemInner::MetaItem` or if it's
+/// `MetaItemInner::Lit(MetaItemLit { kind: LitKind::Bool(_), .. })`.
+pubfnmeta_item_or_bool(&self) -> Option<&MetaItemInner>{
 matchself{
-NestedMetaItem::MetaItem(_item) => Some(self),
-NestedMetaItem::Lit(MetaItemLit{kind:LitKind::Bool(_), .. }) => Some(self),
+MetaItemInner::MetaItem(_item) => Some(self),
+MetaItemInner::Lit(MetaItemLit{kind:LitKind::Bool(_), .. }) => Some(self),
  _ => None,
 }
 }
 
-/// Returns the `MetaItem` if `self` is a `NestedMetaItem::MetaItem`.
+/// Returns the `MetaItem` if `self` is a `MetaItemInner::MetaItem`.
 pubfnmeta_item(&self) -> Option<&MetaItem>{
 matchself{
-NestedMetaItem::MetaItem(item) => Some(item),
+MetaItemInner::MetaItem(item) => Some(item),
  _ => None,
 }
 }
@@ -550,22 +550,22 @@ impl NestedMetaItem {
 self.meta_item().is_some()
 }
 
-fnfrom_tokens<'a,I>(tokens:&mut iter::Peekable<I>) -> Option<NestedMetaItem>
+fnfrom_tokens<'a,I>(tokens:&mut iter::Peekable<I>) -> Option<MetaItemInner>
 where
 I:Iterator<Item = &'aTokenTree>,
 {
 match tokens.peek(){
 Some(TokenTree::Token(token, _))ifletSome(lit) = MetaItemLit::from_token(token) => {
  tokens.next();
-returnSome(NestedMetaItem::Lit(lit));
+returnSome(MetaItemInner::Lit(lit));
 }
 Some(TokenTree::Delimited(..,Delimiter::Invisible, inner_tokens)) => {
  tokens.next();
-returnNestedMetaItem::from_tokens(&mut inner_tokens.trees().peekable());
+returnMetaItemInner::from_tokens(&mut inner_tokens.trees().peekable());
 }
  _ => {}
 }
-MetaItem::from_tokens(tokens).map(NestedMetaItem::MetaItem)
+MetaItem::from_tokens(tokens).map(MetaItemInner::MetaItem)
 }
 }
 
@@ -676,6 +676,6 @@ pub fn contains_name(attrs: &[Attribute], name: Symbol) -> bool {
 find_by_name(attrs, name).is_some()
 }
 
-pubfnlist_contains_name(items:&[NestedMetaItem],name:Symbol) -> bool{
+pubfnlist_contains_name(items:&[MetaItemInner],name:Symbol) -> bool{
  items.iter().any(|item| item.has_name(name))
 }

compiler/rustc_ast/src/mut_visit.rs

@@ -83,7 +83,7 @@ pub trait MutVisitor: Sized {
 walk_crate(self, c)
 }
 
-fnvisit_meta_list_item(&mutself,list_item:&mutNestedMetaItem){
+fnvisit_meta_list_item(&mutself,list_item:&mutMetaItemInner){
 walk_meta_list_item(self, list_item);
 }
 
@@ -659,10 +659,10 @@ fn walk_macro_def<T: MutVisitor>(vis: &mut T, macro_def: &mut MacroDef) {
 visit_delim_args(vis, body);
 }
 
-fnwalk_meta_list_item<T:MutVisitor>(vis:&mutT,li:&mutNestedMetaItem){
+fnwalk_meta_list_item<T:MutVisitor>(vis:&mutT,li:&mutMetaItemInner){
 match li {
-NestedMetaItem::MetaItem(mi) => vis.visit_meta_item(mi),
-NestedMetaItem::Lit(_lit) => {}
+MetaItemInner::MetaItem(mi) => vis.visit_meta_item(mi),
+MetaItemInner::Lit(_lit) => {}
 }
 }
 

compiler/rustc_ast_pretty/src/pprust/mod.rs

@@ -67,7 +67,7 @@ pub fn vis_to_string(v: &ast::Visibility) -> String {
 State::new().vis_to_string(v)
 }
 
-pubfnmeta_list_item_to_string(li:&ast::NestedMetaItem) -> String{
+pubfnmeta_list_item_to_string(li:&ast::MetaItemInner) -> String{
 State::new().meta_list_item_to_string(li)
 }
 

compiler/rustc_ast_pretty/src/pprust/state.rs

@@ -2006,10 +2006,10 @@ impl<'a> State<'a> {
 self.print_attribute_inline(attr,false)
 }
 
-fnprint_meta_list_item(&mutself,item:&ast::NestedMetaItem){
+fnprint_meta_list_item(&mutself,item:&ast::MetaItemInner){
 match item {
- ast::NestedMetaItem::MetaItem(mi) => self.print_meta_item(mi),
- ast::NestedMetaItem::Lit(lit) => self.print_meta_item_lit(lit),
+ ast::MetaItemInner::MetaItem(mi) => self.print_meta_item(mi),
+ ast::MetaItemInner::Lit(lit) => self.print_meta_item_lit(lit),
 }
 }
 
@@ -2054,7 +2054,7 @@ impl<'a> State<'a> {
 Self::to_string(|s| s.print_path_segment(p,false))
 }
 
-pub(crate)fnmeta_list_item_to_string(&self,li:&ast::NestedMetaItem) -> String{
+pub(crate)fnmeta_list_item_to_string(&self,li:&ast::MetaItemInner) -> String{
 Self::to_string(|s| s.print_meta_list_item(li))
 }
 

compiler/rustc_attr/src/builtin.rs

@@ -4,7 +4,7 @@ use std::num::NonZero;
 
 use rustc_abi::Align;
 use rustc_ast::{
-selfas ast,Attribute,LitKind,MetaItem,MetaItemKind,MetaItemLit,NestedMetaItem,NodeId,
+selfas ast,Attribute,LitKind,MetaItem,MetaItemInner,MetaItemKind,MetaItemLit,NodeId,
  attr,
 };
 use rustc_ast_pretty::pprust;
@@ -534,7 +534,7 @@ pub struct Condition {
 
 /// Tests if a cfg-pattern matches the cfg set
 pubfncfg_matches(
-cfg:&ast::NestedMetaItem,
+cfg:&ast::MetaItemInner,
 sess:&Session,
 lint_node_id:NodeId,
 features:Option<&Features>,
@@ -605,16 +605,16 @@ pub fn parse_version(s: Symbol) -> Option<RustcVersion> {
 /// Evaluate a cfg-like condition (with `any` and `all`), using `eval` to
 /// evaluate individual items.
 pubfneval_condition(
-cfg:&ast::NestedMetaItem,
+cfg:&ast::MetaItemInner,
 sess:&Session,
 features:Option<&Features>,
 eval:&mutimplFnMut(Condition) -> bool,
 ) -> bool{
 let dcx = sess.dcx();
 
 let cfg = match cfg {
- ast::NestedMetaItem::MetaItem(meta_item) => meta_item,
- ast::NestedMetaItem::Lit(MetaItemLit{kind:LitKind::Bool(b), .. }) => {
+ ast::MetaItemInner::MetaItem(meta_item) => meta_item,
+ ast::MetaItemInner::Lit(MetaItemLit{kind:LitKind::Bool(b), .. }) => {
 ifletSome(features) = features {
 // we can't use `try_gate_cfg` as symbols don't differentiate between `r#true`
 // and `true`, and we want to keep the former working without feature gate
@@ -646,12 +646,12 @@ pub fn eval_condition(
  ast::MetaItemKind::List(mis)if cfg.name_or_empty() == sym::version => {
 try_gate_cfg(sym::version, cfg.span, sess, features);
 let(min_version, span) = match&mis[..]{
-[NestedMetaItem::Lit(MetaItemLit{kind:LitKind::Str(sym, ..), span, .. })] => {
+[MetaItemInner::Lit(MetaItemLit{kind:LitKind::Str(sym, ..), span, .. })] => {
 (sym, span)
 }
 [
-NestedMetaItem::Lit(MetaItemLit{ span, .. })
- | NestedMetaItem::MetaItem(MetaItem{ span, .. }),
+MetaItemInner::Lit(MetaItemLit{ span, .. })
+ | MetaItemInner::MetaItem(MetaItem{ span, .. }),
 ] => {
  dcx.emit_err(session_diagnostics::ExpectedVersionLiteral{span:*span });
 returnfalse;
@@ -729,7 +729,7 @@ pub fn eval_condition(
 }
 
  res &eval_condition(
-&ast::NestedMetaItem::MetaItem(mi),
+&ast::MetaItemInner::MetaItem(mi),
  sess,
  features,
  eval,
@@ -873,7 +873,7 @@ pub fn find_deprecation(
 
 for meta in list {
 match meta {
-NestedMetaItem::MetaItem(mi) => match mi.name_or_empty(){
+MetaItemInner::MetaItem(mi) => match mi.name_or_empty(){
  sym::since => {
 if !get(mi,&mut since){
 continue'outer;
@@ -912,7 +912,7 @@ pub fn find_deprecation(
 continue'outer;
 }
 },
-NestedMetaItem::Lit(lit) => {
+MetaItemInner::Lit(lit) => {
  sess.dcx().emit_err(session_diagnostics::UnsupportedLiteral{
 span: lit.span,
 reason:UnsupportedLiteralReason::DeprecatedKvPair,
@@ -1277,7 +1277,7 @@ pub fn parse_confusables(attr: &Attribute) -> Option<Vec<Symbol>> {
 letmut candidates = Vec::new();
 
 for meta in metas {
-letNestedMetaItem::Lit(meta_lit) = meta else{
+letMetaItemInner::Lit(meta_lit) = meta else{
 returnNone;
 };
  candidates.push(meta_lit.symbol);

compiler/rustc_builtin_macros/src/cfg.rs

@@ -39,7 +39,7 @@ fn parse_cfg<'a>(
 cx:&ExtCtxt<'a>,
 span:Span,
 tts:TokenStream,
-) -> PResult<'a, ast::NestedMetaItem>{
+) -> PResult<'a, ast::MetaItemInner>{
 letmut p = cx.new_parser_from_tts(tts);
 
 if p.token == token::Eof{

compiler/rustc_builtin_macros/src/derive.rs

@@ -1,5 +1,5 @@
 use rustc_ast as ast;
-use rustc_ast::{GenericParamKind,ItemKind,MetaItemKind,NestedMetaItem,StmtKind};
+use rustc_ast::{GenericParamKind,ItemKind,MetaItemInner,MetaItemKind,StmtKind};
 use rustc_expand::base::{
 Annotatable,DeriveResolution,ExpandResult,ExtCtxt,Indeterminate,MultiItemModifier,
 };
@@ -50,8 +50,8 @@ impl MultiItemModifier for Expander {
 MetaItemKind::List(list) => {
  list.iter()
 .filter_map(|nested_meta| match nested_meta {
-NestedMetaItem::MetaItem(meta) => Some(meta),
-NestedMetaItem::Lit(lit) => {
+MetaItemInner::MetaItem(meta) => Some(meta),
+MetaItemInner::Lit(lit) => {
 // Reject `#[derive("Debug")]`.
 report_unexpected_meta_item_lit(sess, lit);
 None

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -1,4 +1,4 @@
-use rustc_ast::{MetaItemKind,NestedMetaItem, ast, attr};
+use rustc_ast::{MetaItemInner,MetaItemKind, ast, attr};
 use rustc_attr::{InlineAttr,InstructionSetAttr,OptimizeAttr, list_contains_name};
 use rustc_errors::codes::*;
 use rustc_errors::{DiagMessage,SubdiagMessage, struct_span_code_err};
@@ -357,7 +357,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
  sym::instruction_set => {
  codegen_fn_attrs.instruction_set =
  attr.meta_item_list().and_then(|l| match&l[..]{
-[NestedMetaItem::MetaItem(set)] => {
+[MetaItemInner::MetaItem(set)] => {
 let segments =
  set.path.segments.iter().map(|x| x.ident.name).collect::<Vec<_>>();
 match segments.as_slice(){

compiler/rustc_codegen_ssa/src/lib.rs

@@ -156,7 +156,7 @@ pub struct NativeLib {
 pubkind:NativeLibKind,
 pubname:Symbol,
 pubfilename:Option<Symbol>,
-pubcfg:Option<ast::NestedMetaItem>,
+pubcfg:Option<ast::MetaItemInner>,
 pubverbatim:bool,
 pubdll_imports:Vec<cstore::DllImport>,
 }