about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCaleb Cartwright <caleb.cartwright@outlook.com>2020-11-28 14:58:10 -0600
committerCaleb Cartwright <calebcartwright@users.noreply.github.com>2020-11-28 17:41:21 -0600
commit5b216029b5f8512934d279967a47a74732ca31a8 (patch)
tree4de7540354679ded7a87bb476aabd971104dfefc
parentbaee271013bfc2d2072a266675e16c6d9dde766f (diff)
downloadrust-5b216029b5f8512934d279967a47a74732ca31a8.tar.gz
rust-5b216029b5f8512934d279967a47a74732ca31a8.zip
deps: minor rustc_ast changes for v691
-rw-r--r--src/modules/visitor.rs2
-rw-r--r--src/skip.rs2
-rw-r--r--src/visitor.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/visitor.rs b/src/modules/visitor.rs
index 42d5351080d..d5acf3f1cbc 100644
--- a/src/modules/visitor.rs
+++ b/src/modules/visitor.rs
@@ -30,7 +30,7 @@ impl<'a> CfgIfVisitor<'a> {
 }
 
 impl<'a, 'ast: 'a> Visitor<'ast> for CfgIfVisitor<'a> {
-    fn visit_mac(&mut self, mac: &'ast ast::MacCall) {
+    fn visit_mac_call(&mut self, mac: &'ast ast::MacCall) {
         match self.visit_mac_inner(mac) {
             Ok(()) => (),
             Err(e) => debug!("{}", e),
diff --git a/src/skip.rs b/src/skip.rs
index fd48e67ee73..6c500635a95 100644
--- a/src/skip.rs
+++ b/src/skip.rs
@@ -58,7 +58,7 @@ fn get_skip_names(kind: &str, attrs: &[ast::Attribute]) -> Vec<String> {
     for attr in attrs {
         // rustc_ast::ast::Path is implemented partialEq
         // but it is designed for segments.len() == 1
-        if let ast::AttrKind::Normal(attr_item) = &attr.kind {
+        if let ast::AttrKind::Normal(attr_item, _) = &attr.kind {
             if pprust::path_to_string(&attr_item.path) != path {
                 continue;
             }
diff --git a/src/visitor.rs b/src/visitor.rs
index a5f6ebfb67b..ecf72833195 100644
--- a/src/visitor.rs
+++ b/src/visitor.rs
@@ -851,7 +851,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                 );
             } else {
                 match &attr.kind {
-                    ast::AttrKind::Normal(ref attribute_item)
+                    ast::AttrKind::Normal(ref attribute_item, _)
                         if self.is_unknown_rustfmt_attr(&attribute_item.path.segments) =>
                     {
                         let file_name = self.parse_sess.span_to_filename(attr.span);