Update rustc_ap_syntax

Author: nrc

Cargo.lock

@@ -46,8 +46,8 @@ env_logger = "0.5"
 getopts = "0.2"
 derive-new = "0.5"
 cargo_metadata = "0.5.1"
-rustc-ap-rustc_target = "113.0.0"
-rustc-ap-syntax = "113.0.0"
+rustc-ap-rustc_target = "121.0.0"
+rustc-ap-syntax = "121.0.0"
 failure = "0.1.1"
 
 [dev-dependencies]

Cargo.toml

@@ -200,9 +200,9 @@ fn allow_mixed_tactic_for_nested_metaitem_list(list: &[ast::NestedMetaItem]) ->
 impl Rewrite for ast::MetaItem {
     fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
         Some(match self.node {
-            ast::MetaItemKind::Word => String::from(&*self.ident.name.as_str()),
+            ast::MetaItemKind::Word => String::from(&*self.name().as_str()),
             ast::MetaItemKind::List(ref list) => {
-                let name = self.ident.name.as_str();
+                let name = self.name().as_str();
                 let item_shape = match context.config.indent_style() {
                     IndentStyle::Block => shape
                         .block_indent(context.config.tab_spaces())
@@ -260,7 +260,7 @@ impl Rewrite for ast::MetaItem {
                 }
             }
             ast::MetaItemKind::NameValue(ref literal) => {
-                let name = self.ident.name.as_str();
+                let name = self.name().as_str();
                 // 3 = ` = `
                 let lit_shape = shape.shrink_left(name.len() + 3)?;
                 // `rewrite_literal` returns `None` when `literal` exceeds max

src/attr.rs

@@ -211,9 +211,9 @@ pub fn last_line_extendable(s: &str) -> bool {
 #[inline]
 fn is_skip(meta_item: &MetaItem) -> bool {
     match meta_item.node {
-        MetaItemKind::Word => meta_item.ident.name == SKIP_ANNOTATION,
+        MetaItemKind::Word => meta_item.name() == SKIP_ANNOTATION,
         MetaItemKind::List(ref l) => {
-            meta_item.ident.name == "cfg_attr" && l.len() == 2 && is_skip_nested(&l[1])
+            meta_item.name() == "cfg_attr" && l.len() == 2 && is_skip_nested(&l[1])
         }
         _ => false,
     }