Auto merge of #12153 - GuillaumeGomez:non-exhaustive, r=llogiq
Don't emit `derive_partial_eq_without_eq` lint if the type has the `non_exhaustive` attribute Part of https://github.com/rust-lang/rust-clippy/issues/9063. If a type has a field/variant with the `#[non_exhaustive]` attribute or the type itself has it, then do no emit the `derive_partial_eq_without_eq` lint. changelog: Don't emit `derive_partial_eq_without_eq` lint if the type has the `non_exhaustive` attribute
This commit is contained in:
commit
a8017ae131
@ -1,6 +1,6 @@
|
||||
use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_note, span_lint_and_sugg, span_lint_and_then};
|
||||
use clippy_utils::ty::{implements_trait, implements_trait_with_env, is_copy};
|
||||
use clippy_utils::{is_lint_allowed, match_def_path, paths};
|
||||
use clippy_utils::{has_non_exhaustive_attr, is_lint_allowed, match_def_path, paths};
|
||||
use rustc_errors::Applicability;
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_hir::intravisit::{walk_expr, walk_fn, walk_item, FnKind, Visitor};
|
||||
@ -449,6 +449,7 @@ fn check_partial_eq_without_eq<'tcx>(cx: &LateContext<'tcx>, span: Span, trait_r
|
||||
&& let Some(eq_trait_def_id) = cx.tcx.get_diagnostic_item(sym::Eq)
|
||||
&& let Some(def_id) = trait_ref.trait_def_id()
|
||||
&& cx.tcx.is_diagnostic_item(sym::PartialEq, def_id)
|
||||
&& !has_non_exhaustive_attr(cx.tcx, *adt)
|
||||
&& let param_env = param_env_for_derived_eq(cx.tcx, adt.did(), eq_trait_def_id)
|
||||
&& !implements_trait_with_env(cx.tcx, param_env, ty, eq_trait_def_id, adt.did(),&[])
|
||||
// If all of our fields implement `Eq`, we can implement `Eq` too
|
||||
|
@ -1,5 +1,6 @@
|
||||
use rustc_ast::{ast, attr};
|
||||
use rustc_errors::Applicability;
|
||||
use rustc_middle::ty::{AdtDef, TyCtxt};
|
||||
use rustc_session::Session;
|
||||
use rustc_span::sym;
|
||||
use std::str::FromStr;
|
||||
@ -159,3 +160,14 @@ pub fn is_doc_hidden(attrs: &[ast::Attribute]) -> bool {
|
||||
.filter_map(ast::Attribute::meta_item_list)
|
||||
.any(|l| attr::list_contains_name(&l, sym::hidden))
|
||||
}
|
||||
|
||||
pub fn has_non_exhaustive_attr(tcx: TyCtxt<'_>, adt: AdtDef<'_>) -> bool {
|
||||
adt.is_variant_list_non_exhaustive()
|
||||
|| tcx.has_attr(adt.did(), sym::non_exhaustive)
|
||||
|| adt.variants().iter().any(|variant_def| {
|
||||
variant_def.is_field_list_non_exhaustive() || tcx.has_attr(variant_def.def_id, sym::non_exhaustive)
|
||||
})
|
||||
|| adt
|
||||
.all_fields()
|
||||
.any(|field_def| tcx.has_attr(field_def.did, sym::non_exhaustive))
|
||||
}
|
||||
|
@ -121,4 +121,36 @@ pub fn _from_mod() -> _hidden::InPubFn {
|
||||
#[derive(PartialEq)]
|
||||
struct InternalTy;
|
||||
|
||||
// This is a `non_exhaustive` type so should not warn.
|
||||
#[derive(Debug, PartialEq)]
|
||||
#[non_exhaustive]
|
||||
pub struct MissingEqNonExhaustive {
|
||||
foo: u32,
|
||||
bar: String,
|
||||
}
|
||||
|
||||
// This is a `non_exhaustive` type so should not warn.
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct MissingEqNonExhaustive1 {
|
||||
foo: u32,
|
||||
#[non_exhaustive]
|
||||
bar: String,
|
||||
}
|
||||
|
||||
// This is a `non_exhaustive` type so should not warn.
|
||||
#[derive(Debug, PartialEq)]
|
||||
#[non_exhaustive]
|
||||
pub enum MissingEqNonExhaustive2 {
|
||||
Foo,
|
||||
Bar,
|
||||
}
|
||||
|
||||
// This is a `non_exhaustive` type so should not warn.
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum MissingEqNonExhaustive3 {
|
||||
Foo,
|
||||
#[non_exhaustive]
|
||||
Bar,
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
@ -121,4 +121,36 @@ pub fn _from_mod() -> _hidden::InPubFn {
|
||||
#[derive(PartialEq)]
|
||||
struct InternalTy;
|
||||
|
||||
// This is a `non_exhaustive` type so should not warn.
|
||||
#[derive(Debug, PartialEq)]
|
||||
#[non_exhaustive]
|
||||
pub struct MissingEqNonExhaustive {
|
||||
foo: u32,
|
||||
bar: String,
|
||||
}
|
||||
|
||||
// This is a `non_exhaustive` type so should not warn.
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct MissingEqNonExhaustive1 {
|
||||
foo: u32,
|
||||
#[non_exhaustive]
|
||||
bar: String,
|
||||
}
|
||||
|
||||
// This is a `non_exhaustive` type so should not warn.
|
||||
#[derive(Debug, PartialEq)]
|
||||
#[non_exhaustive]
|
||||
pub enum MissingEqNonExhaustive2 {
|
||||
Foo,
|
||||
Bar,
|
||||
}
|
||||
|
||||
// This is a `non_exhaustive` type so should not warn.
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum MissingEqNonExhaustive3 {
|
||||
Foo,
|
||||
#[non_exhaustive]
|
||||
Bar,
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
Loading…
Reference in New Issue
Block a user