Fix clippy not compiling with new FieldDef

Author: jedel1043

src/tools/clippy/clippy_lints/src/excessive_bools.rs

@@ -1,6 +1,6 @@
 use clippy_utils::diagnostics::span_lint_and_help;
 use clippy_utils::{in_macro, match_path_ast};
-use rustc_ast::ast::{AssocItemKind, Extern, FnKind, FnSig, ImplKind, Item, ItemKind, TraitKind, Ty, TyKind};
+use rustc_ast::ast::{AssocItemKind, Extern, FnKind, FnSig, ImplKind, Item, ItemKind, TraitKind, Ty, TyKind, FieldVariant, NamedField};
 use rustc_lint::{EarlyContext, EarlyLintPass};
 use rustc_session::{declare_tool_lint, impl_lint_pass};
 use rustc_span::{sym, Span};
@@ -145,7 +145,11 @@ impl EarlyLintPass for ExcessiveBools {
                 let struct_bools = variant_data
                     .fields()
                     .iter()
-                    .filter(|field| is_bool_ty(&field.ty))
+                    .filter(|field| match &field.variant {
+                        FieldVariant::Named(NamedField{ty, ident:_}) if is_bool_ty(ty) => true,
+                        // FIXME: Handle Unnamed variant
+                        _ => false
+                    })
                     .count()
                     .try_into()
                     .unwrap();

src/tools/clippy/clippy_lints/src/manual_non_exhaustive.rs

@@ -3,7 +3,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::meets_msrv;
 use clippy_utils::source::snippet_opt;
 use if_chain::if_chain;
-use rustc_ast::ast::{FieldDef, Item, ItemKind, Variant, VariantData, VisibilityKind};
+use rustc_ast::ast::{FieldDef, Item, ItemKind, Variant, VariantData, VisibilityKind, FieldVariant, NamedField};
 use rustc_errors::Applicability;
 use rustc_lint::{EarlyContext, EarlyLintPass};
 use rustc_semver::RustcVersion;
@@ -141,7 +141,12 @@ fn check_manual_non_exhaustive_struct(cx: &EarlyContext<'_>, item: &Item, data:
     }
 
     fn is_non_exhaustive_marker(field: &FieldDef) -> bool {
-        is_private(field) && field.ty.kind.is_unit() && field.ident.map_or(true, |n| n.as_str().starts_with('_'))
+        match &field.variant {
+            FieldVariant::Named(NamedField{ty, ident}) =>
+            is_private(field) && ty.kind.is_unit() && ident.map_or(true, |n| n.as_str().starts_with('_')),
+            // FIXME: Handle Unnamed variant
+            _ => false
+        }
     }
 
     fn find_header_span(cx: &EarlyContext<'_>, item: &Item, data: &VariantData) -> Span {

src/tools/clippy/clippy_utils/src/ast_utils.rs

@@ -362,11 +362,23 @@ pub fn eq_variant_data(l: &VariantData, r: &VariantData) -> bool {
 }
 
 pub fn eq_struct_field(l: &FieldDef, r: &FieldDef) -> bool {
-    l.is_placeholder == r.is_placeholder
-        && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r))
-        && eq_vis(&l.vis, &r.vis)
-        && both(&l.ident, &r.ident, |l, r| eq_id(*l, *r))
-        && eq_ty(&l.ty, &r.ty)
+    if l.is_placeholder != r.is_placeholder
+    || !over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r))
+    || !eq_vis(&l.vis, &r.vis)
+    {
+        false
+    } else {
+        match (&l.variant, &r.variant) {
+            (FieldVariant::Named(NamedField{ident: l_ident, ty: l_ty}),
+            FieldVariant::Named(NamedField{ident: r_ident, ty: r_ty})) =>
+            both(l_ident, r_ident, |l, r| eq_id(*l, *r))
+            && eq_ty(l_ty, r_ty),
+            // FIXME: Compare two unnamed fields and check for equality
+            (FieldVariant::Unnamed(_),
+            FieldVariant::Named(_)) => false,
+            _ => false
+        }
+    }
 }
 
 pub fn eq_fn_sig(l: &FnSig, r: &FnSig) -> bool {