Fix tools

Author: inquisitivecrystal

src/librustdoc/clean/mod.rs

@@ -1859,7 +1859,7 @@ impl Clean<Vec<Item>> for (&hir::Item<'_>, Option<Symbol>) {
                 ItemKind::Fn(ref sig, ref generics, body_id) => {
                     clean_fn_or_proc_macro(item, sig, generics, body_id, &mut name, cx)
                 }
-                ItemKind::Macro { ref macro_def, .. } => MacroItem(Macro {
+                ItemKind::Macro(ref macro_def) => MacroItem(Macro {
                     source: display_macro_source(cx, name, &macro_def.ast, def_id, &item.vis),
                     imported_from: None,
                 }),

src/librustdoc/doctest.rs

@@ -1172,11 +1172,15 @@ impl<'a, 'hir, 'tcx> intravisit::Visitor<'hir> for HirCollector<'a, 'hir, 'tcx>
 
     fn visit_item(&mut self, item: &'hir hir::Item<'_>) {
         let name = match &item.kind {
-            hir::ItemKind::Macro { is_exported: false, .. } => {
+            hir::ItemKind::Macro(ref macro_def) => {
                 // FIXME(#88038): Non exported macros have historically not been tested,
                 // but we really ought to start testing them.
-                intravisit::walk_item(self, item);
-                return;
+                let def_id = item.def_id.to_def_id();
+                if macro_def.ast.macro_rules && !self.tcx.has_attr(def_id, sym::macro_export) {
+                    intravisit::walk_item(self, item);
+                    return;
+                }
+                item.ident.to_string()
             }
             hir::ItemKind::Impl(impl_) => {
                 rustc_hir_pretty::id_to_string(&self.map, impl_.self_ty.hir_id)

src/librustdoc/visit_ast.rs

@@ -283,7 +283,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
             hir::ItemKind::Mod(ref m) => {
                 om.mods.push(self.visit_mod_contents(&item.vis, item.hir_id(), m, name));
             }
-            hir::ItemKind::Macro { ref macro_def, .. } => {
+            hir::ItemKind::Macro(ref macro_def) => {
                 // `#[macro_export] macro_rules!` items are handled seperately in `visit()`,
                 // above, since they need to be documented at the module top level. Accordingly,
                 // we only want to handle macros if one of three conditions holds:

src/tools/clippy/clippy_lints/src/utils/inspector.rs

@@ -408,16 +408,10 @@ fn print_item(cx: &LateContext<'_>, item: &hir::Item<'_>) {
         },
         hir::ItemKind::Mod(..) => println!("module"),
         hir::ItemKind::ForeignMod { abi, .. } => println!("foreign module with abi: {}", abi),
-        hir::ItemKind::Macro { ref macro_def, .. } => {
+        hir::ItemKind::Macro(ref macro_def) => {
             if macro_def.ast.macro_rules {
-                if macro_def.is_exported {
-                    println!("exported macro introduced by `macro_rules!`");
-                } else {
-                    println!("nonexported macro introduced by `macro_rules!`");
-                }
+                println!("macro introduced by `macro_rules!`");
             } else {
-                // There's no point in distinguishing exported and nonexported `macro`
-                // macros. That's defined their visibility, which was printed above.
                 println!("macro introduced by `macro`");
             }
         }