Perform minor cleanup

Author: inquisitivecrystal

compiler/rustc_hir/src/hir.rs

@@ -2844,7 +2844,7 @@ impl ItemKind<'_> {
             ItemKind::Fn(..) => "function",
             ItemKind::Mod(..) => "module",
             ItemKind::ForeignMod { .. } => "extern block",
-            ItemKind::Macro { .. } => "macro",
+            ItemKind::Macro(..) => "macro",
             ItemKind::GlobalAsm(..) => "global asm item",
             ItemKind::TyAlias(..) => "type alias",
             ItemKind::OpaqueTy(..) => "opaque type",

compiler/rustc_hir/src/target.rs

@@ -113,7 +113,7 @@ impl Target {
             ItemKind::Fn(..) => Target::Fn,
             ItemKind::Mod(..) => Target::Mod,
             ItemKind::ForeignMod { .. } => Target::ForeignMod,
-            ItemKind::Macro { .. } => Target::MacroDef,
+            ItemKind::Macro(..) => Target::MacroDef,
             ItemKind::GlobalAsm(..) => Target::GlobalAsm,
             ItemKind::TyAlias(..) => Target::TyAlias,
             ItemKind::OpaqueTy(..) => Target::OpaqueTy,

compiler/rustc_lint/src/builtin.rs

@@ -617,10 +617,10 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
                 return;
             }
 
-            hir::ItemKind::Macro { .. }
-            | hir::ItemKind::TyAlias(..)
+            hir::ItemKind::TyAlias(..)
             | hir::ItemKind::Fn(..)
             | hir::ItemKind::Mod(..)
+            | hir::ItemKind::Macro(..)
             | hir::ItemKind::Enum(..)
             | hir::ItemKind::Struct(..)
             | hir::ItemKind::Union(..)

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -1952,7 +1952,7 @@ impl EncodeContext<'a, 'tcx> {
             | hir::ItemKind::Fn(..)
             | hir::ItemKind::Mod(..)
             | hir::ItemKind::ForeignMod { .. }
-            | hir::ItemKind::Macro { .. }
+            | hir::ItemKind::Macro(..)
             | hir::ItemKind::GlobalAsm(..)
             | hir::ItemKind::ExternCrate(..)
             | hir::ItemKind::Use(..)

compiler/rustc_middle/src/hir/map/mod.rs

@@ -228,7 +228,7 @@ impl<'hir> Map<'hir> {
                 ItemKind::ExternCrate(_) => DefKind::ExternCrate,
                 ItemKind::Use(..) => DefKind::Use,
                 ItemKind::ForeignMod { .. } => DefKind::ForeignMod,
-                ItemKind::Macro { .. } => DefKind::Macro(MacroKind::Bang),
+                ItemKind::Macro(..) => DefKind::Macro(MacroKind::Bang),
                 ItemKind::GlobalAsm(..) => DefKind::GlobalAsm,
                 ItemKind::Impl { .. } => DefKind::Impl,
             },
@@ -1042,7 +1042,7 @@ fn hir_id_to_string(map: &Map<'_>, id: HirId) -> String {
                 ItemKind::Fn(..) => "fn",
                 ItemKind::Mod(..) => "mod",
                 ItemKind::ForeignMod { .. } => "foreign mod",
-                ItemKind::Macro { .. } => "macro",
+                ItemKind::Macro(..) => "macro",
                 ItemKind::GlobalAsm(..) => "global asm",
                 ItemKind::TyAlias(..) => "ty",
                 ItemKind::OpaqueTy(..) => "opaque type",

compiler/rustc_mir/src/monomorphize/collector.rs

@@ -1150,7 +1150,7 @@ impl ItemLikeVisitor<'v> for RootCollector<'_, 'v> {
             hir::ItemKind::ExternCrate(..)
             | hir::ItemKind::Use(..)
             | hir::ItemKind::ForeignMod { .. }
-            | hir::ItemKind::Macro { .. }
+            | hir::ItemKind::Macro(..)
             | hir::ItemKind::TyAlias(..)
             | hir::ItemKind::Trait(..)
             | hir::ItemKind::TraitAlias(..)

compiler/rustc_passes/src/reachable.rs

@@ -264,7 +264,7 @@ impl<'tcx> ReachableContext<'tcx> {
                     | hir::ItemKind::TyAlias(..)
                     | hir::ItemKind::Mod(..)
                     | hir::ItemKind::ForeignMod { .. }
-                    | hir::ItemKind::Macro { .. }
+                    | hir::ItemKind::Macro(..)
                     | hir::ItemKind::Impl { .. }
                     | hir::ItemKind::Trait(..)
                     | hir::ItemKind::TraitAlias(..)

compiler/rustc_passes/src/stability.rs

@@ -613,11 +613,10 @@ impl<'tcx> Visitor<'tcx> for MissingStabilityAnnotations<'tcx> {
     }
 
     fn visit_item(&mut self, i: &'tcx Item<'tcx>) {
-        // Inherent impls, foreign modules, and non exported macros serve only as
-        // containers for other items, they don't have their own stability. They still can
-        // be annotated as unstable and propagate this unstability to children, but this
-        // annotation is completely optional. They inherit stability from their parents
-        // when unannotated.
+        // Inherent impls and foreign modules serve only as containers for other items,
+        // they don't have their own stability. They still can be annotated as unstable
+        // and propagate this unstability to children, but this annotation is completely
+        // optional. They inherit stability from their parents when unannotated.
         if !matches!(
             i.kind,
             hir::ItemKind::Impl(hir::Impl { of_trait: None, .. })

compiler/rustc_privacy/src/lib.rs

@@ -778,7 +778,7 @@ impl Visitor<'tcx> for EmbargoVisitor<'tcx> {
         // Mark all items in interfaces of reachable items as reachable.
         match item.kind {
             // The interface is empty.
-            hir::ItemKind::Macro { .. } | hir::ItemKind::ExternCrate(..) => {}
+            hir::ItemKind::Macro(..) | hir::ItemKind::ExternCrate(..) => {}
 
             // All nested items are checked by `visit_item`.
             hir::ItemKind::Mod(..) => {}
@@ -1988,7 +1988,7 @@ impl<'tcx> Visitor<'tcx> for PrivateItemsInPublicInterfacesVisitor<'tcx> {
             // Checked in resolve.
             hir::ItemKind::Use(..) => {}
             // No subitems.
-            hir::ItemKind::GlobalAsm(..) | hir::ItemKind::Macro { .. } => {}
+            hir::ItemKind::Macro(..) | hir::ItemKind::GlobalAsm(..) => {}
             // Subitems of these items have inherited publicity.
             hir::ItemKind::Const(..)
             | hir::ItemKind::Static(..)

compiler/rustc_resolve/src/late/lifetimes.rs

@@ -742,7 +742,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
             | hir::ItemKind::Use(..)
             | hir::ItemKind::Mod(..)
             | hir::ItemKind::ForeignMod { .. }
-            | hir::ItemKind::Macro { .. }
+            | hir::ItemKind::Macro(..)
             | hir::ItemKind::GlobalAsm(..) => {
                 // These sorts of items have no lifetime parameters at all.
                 intravisit::walk_item(self, item);