Rollup merge of #155702 - mejrs:itemkind_trait-fields, r=petrochenkov

Change `ItemKind::Trait` to a field variant.

This changes `ItemKind::Trait` from an octuple(!!) to an enum variant with fields. Their names were chosen to match up with existing usage and minimize renaming.

I'm leaning towards renaming `ident` to `name` as well; let me know if that's desired.

Author: JonathanBrouwer

clippy_lints/src/arbitrary_source_item_ordering.rs

@@ -306,16 +306,16 @@ impl<'tcx> LateLintPass<'tcx> for ArbitrarySourceItemOrdering {
                     cur_f = Some(field);
                 }
             },
-            ItemKind::Trait(
-                _impl_restriction,
-                _constness,
+            ItemKind::Trait {
+                impl_restriction:_,
+                constness:_,
                 is_auto,
-                _safety,
-                _ident,
-                _generics,
-                _generic_bounds,
-                item_ref,
-            ) if self.enable_ordering_for_trait && *is_auto == IsAuto::No => {
+                safety:_,
+                ident:_,
+                generics: _,
+                bounds: _,
+                items: item_ref}
+             if self.enable_ordering_for_trait && *is_auto == IsAuto::No => {
                 let mut cur_t: Option<(TraitItemId, Ident)> = None;
 
                 for &item in *item_ref {
@@ -510,7 +510,7 @@ fn convert_module_item_kind(value: &ItemKind<'_>) -> SourceItemOrderingModuleIte
         ItemKind::Enum(..) => Enum,
         ItemKind::Struct(..) => Struct,
         ItemKind::Union(..) => Union,
-        ItemKind::Trait(..) => Trait,
+        ItemKind::Trait { .. } => Trait,
         ItemKind::TraitAlias(..) => TraitAlias,
         ItemKind::Impl(..) => Impl,
     }

clippy_lints/src/doc/mod.rs

@@ -769,7 +769,7 @@ impl<'tcx> LateLintPass<'tcx> for Documentation {
                     {
                         missing_headers::check(cx, item.owner_id, sig, headers, Some(body), self.check_private_items);
                     },
-                    ItemKind::Trait(_, _, _, unsafety, ..) => match (headers.safety, unsafety) {
+                    ItemKind::Trait { safety, .. } => match (headers.safety, safety) {
                         (false, Safety::Unsafe) => span_lint(
                             cx,
                             MISSING_SAFETY_DOC,

clippy_lints/src/doc/too_long_first_doc_paragraph.rs

@@ -33,7 +33,7 @@ pub(super) fn check(
                 | ItemKind::Enum(..)
                 | ItemKind::Struct(..)
                 | ItemKind::Union(..)
-                | ItemKind::Trait(..)
+                | ItemKind::Trait { .. }
                 | ItemKind::TraitAlias(..)
         )
     {

clippy_lints/src/item_name_repetitions.rs

@@ -528,7 +528,7 @@ impl LateLintPass<'_> for ItemNameRepetitions {
             | ItemKind::Fn { ident, .. }
             | ItemKind::Macro(ident, ..)
             | ItemKind::Static(_, ident, ..)
-            | ItemKind::Trait(_, _, _, _, ident, ..)
+            | ItemKind::Trait { ident, ..}
             | ItemKind::TraitAlias(_, ident, ..)
             | ItemKind::TyAlias(ident, ..)
             | ItemKind::Union(ident, ..)

clippy_lints/src/len_without_is_empty.rs

@@ -44,7 +44,7 @@ declare_lint_pass!(LenWithoutIsEmpty => [LEN_WITHOUT_IS_EMPTY]);
 
 impl<'tcx> LateLintPass<'tcx> for LenWithoutIsEmpty {
     fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
-        if let ItemKind::Trait(_, _, _, _, ident, _, _, trait_items) = item.kind
+        if let ItemKind::Trait { ident, items: trait_items, .. } = item.kind
             && !item.span.from_expansion()
         {
             check_trait_items(cx, item, ident, trait_items);

clippy_lints/src/missing_const_for_fn.rs

@@ -141,7 +141,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingConstForFn {
             let parent = cx.tcx.hir_get_parent_item(hir_id).def_id;
             if parent != CRATE_DEF_ID
                 && let hir::Node::Item(item) = cx.tcx.hir_node_by_def_id(parent)
-                && let hir::ItemKind::Trait(..) = &item.kind
+                && let hir::ItemKind::Trait { .. } = &item.kind
             {
                 return;
             }

clippy_lints/src/missing_doc.rs

@@ -159,7 +159,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
             | ItemKind::Macro(ident, ..)
             | ItemKind::Static(_, ident, ..)
             | ItemKind::Struct(ident, ..)
-            | ItemKind::Trait(_, _, _, _, ident, ..)
+            | ItemKind::Trait { ident, .. }
             | ItemKind::TraitAlias(_, ident, ..)
             | ItemKind::TyAlias(ident, ..)
             | ItemKind::Union(ident, ..) => ident.span,

clippy_lints/src/missing_inline.rs

@@ -111,7 +111,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
                 let attrs = cx.tcx.hir_attrs(it.hir_id());
                 check_missing_inline_attrs(cx, attrs, it.span, desc, None);
             },
-            hir::ItemKind::Trait(.., trait_items) => {
+            hir::ItemKind::Trait { items: trait_items, .. } => {
                 // note: we need to check if the trait is exported so we can't use
                 // `LateLintPass::check_trait_item` here.
                 for &tit in trait_items {

clippy_lints/src/needless_pass_by_ref_mut.rs

@@ -167,7 +167,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByRefMut<'tcx> {
         if let Node::Item(item) = cx.tcx.parent_hir_node(hir_id)
             && matches!(
                 item.kind,
-                ItemKind::Impl(Impl { of_trait: Some(_), .. }) | ItemKind::Trait(..)
+                ItemKind::Impl(Impl { of_trait: Some(_), .. }) | ItemKind::Trait { .. }
             )
         {
             return;

clippy_lints/src/needless_pass_by_value.rs

@@ -103,7 +103,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {
         if let Node::Item(item) = cx.tcx.parent_hir_node(hir_id)
             && matches!(
                 item.kind,
-                ItemKind::Impl(Impl { of_trait: Some(_), .. }) | ItemKind::Trait(..)
+                ItemKind::Impl(Impl { of_trait: Some(_), .. }) | ItemKind::Trait { .. }
             )
         {
             return;