Eliminate hir::MacroDef (tools edition)

Author: inquisitivecrystal

src/librustdoc/clean/mod.rs

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

src/librustdoc/doctest.rs

@@ -1176,7 +1176,7 @@ impl<'a, 'hir, 'tcx> intravisit::Visitor<'hir> for HirCollector<'a, 'hir, 'tcx>
                 // FIXME(#88038): Non exported macros have historically not been tested,
                 // but we really ought to start testing them.
                 let def_id = item.def_id.to_def_id();
-                if macro_def.ast.macro_rules && !self.tcx.has_attr(def_id, sym::macro_export) {
+                if macro_def.macro_rules && !self.tcx.has_attr(def_id, sym::macro_export) {
                     intravisit::walk_item(self, item);
                     return;
                 }

src/librustdoc/visit_ast.rs

@@ -296,7 +296,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
                 //    should be inlined even if it is also documented at the top level.
 
                 let def_id = item.def_id.to_def_id();
-                let is_macro_2_0 = !macro_def.ast.macro_rules;
+                let is_macro_2_0 = !macro_def.macro_rules;
                 let nonexported = !self.cx.tcx.has_attr(def_id, sym::macro_export);
 
                 if is_macro_2_0 || nonexported || self.inlining {

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

@@ -409,7 +409,7 @@ 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) => {
-            if macro_def.ast.macro_rules {
+            if macro_def.macro_rules {
                 println!("macro introduced by `macro_rules!`");
             } else {
                 println!("macro introduced by `macro`");