Rollup merge of #155442 - CoCo-Japan-pan:impl-restriction-reorder, r=Urgau,fmease,jhpratt

Change keyword order for `impl` restrictions

Based on rust-lang/rust#155222, this PR reorders keywords in trait definitions to group restrictions with visibility. It changes the order from `pub(...) const unsafe auto impl(...) trait Foo {...}`  to `pub(...) impl(...) const unsafe auto trait Foo {...}`.

Tracking issue for restrictions: rust-lang/rust#105077

r? @Urgau
cc @jhpratt

Author: GuillaumeGomez

clippy_lints/src/arbitrary_source_item_ordering.rs

@@ -307,10 +307,10 @@ impl<'tcx> LateLintPass<'tcx> for ArbitrarySourceItemOrdering {
                 }
             },
             ItemKind::Trait(
+                _impl_restriction,
                 _constness,
                 is_auto,
                 _safety,
-                _impl_restriction,
                 _ident,
                 _generics,
                 _generic_bounds,

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(_, _, _, unsafety, ..) => match (headers.safety, unsafety) {
                         (false, Safety::Unsafe) => span_lint(
                             cx,
                             MISSING_SAFETY_DOC,

clippy_utils/src/ast_utils/mod.rs

@@ -448,30 +448,30 @@ pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool {
         },
         (
             Trait(box ast::Trait {
+                impl_restriction: liprt,
                 constness: lc,
                 is_auto: la,
                 safety: lu,
-                impl_restriction: liprt,
                 ident: li,
                 generics: lg,
                 bounds: lb,
                 items: lis,
             }),
             Trait(box ast::Trait {
+                impl_restriction: riprt,
                 constness: rc,
                 is_auto: ra,
                 safety: ru,
-                impl_restriction: riprt,
                 ident: ri,
                 generics: rg,
                 bounds: rb,
                 items: ris,
             }),
         ) => {
-            matches!(lc, ast::Const::No) == matches!(rc, ast::Const::No)
+            eq_impl_restriction(liprt, riprt)
+                && matches!(lc, ast::Const::No) == matches!(rc, ast::Const::No)
                 && la == ra
                 && matches!(lu, Safety::Default) == matches!(ru, Safety::Default)
-                && eq_impl_restriction(liprt, riprt)
                 && eq_id(*li, *ri)
                 && eq_generics(lg, rg)
                 && over(lb, rb, eq_generic_bound)

clippy_utils/src/check_proc_macro.rs

@@ -265,14 +265,14 @@ fn item_search_pat(item: &Item<'_>) -> (Pat, Pat) {
         ItemKind::Struct(_, _, VariantData::Struct { .. }) => (Pat::Str("struct"), Pat::Str("}")),
         ItemKind::Struct(..) => (Pat::Str("struct"), Pat::Str(";")),
         ItemKind::Union(..) => (Pat::Str("union"), Pat::Str("}")),
-        ItemKind::Trait(_, _, Safety::Unsafe, ..)
+        ItemKind::Trait(_, _, _, Safety::Unsafe, ..)
         | ItemKind::Impl(Impl {
             of_trait: Some(TraitImplHeader {
                 safety: Safety::Unsafe, ..
             }),
             ..
         }) => (Pat::Str("unsafe"), Pat::Str("}")),
-        ItemKind::Trait(_, IsAuto::Yes, ..) => (Pat::Str("auto"), Pat::Str("}")),
+        ItemKind::Trait(_, _, IsAuto::Yes, ..) => (Pat::Str("auto"), Pat::Str("}")),
         ItemKind::Trait(..) => (Pat::Str("trait"), Pat::Str("}")),
         ItemKind::Impl(_) => (Pat::Str("impl"), Pat::Str("}")),
         ItemKind::Mod(..) => (Pat::Str("mod"), Pat::Str("")),