fix(clippy_lints/matches): wildcard_in_or_patterns will no longer be triggered for types annotated with #[nonexhaustive]

This commit is contained in:
VictorHugoPilled 2024-09-25 13:12:19 -05:00
parent 2a61f59628
commit bc07027397
4 changed files with 97 additions and 5 deletions

View File

@ -1045,7 +1045,7 @@ fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
if !from_expansion { if !from_expansion {
// These don't depend on a relationship between multiple arms // These don't depend on a relationship between multiple arms
match_wild_err_arm::check(cx, ex, arms); match_wild_err_arm::check(cx, ex, arms);
wild_in_or_pats::check(cx, arms); wild_in_or_pats::check(cx, ex, arms);
} }
if let MatchSource::TryDesugar(_) = source { if let MatchSource::TryDesugar(_) = source {

View File

@ -1,11 +1,19 @@
use clippy_utils::diagnostics::span_lint_and_help; use clippy_utils::diagnostics::span_lint_and_help;
use clippy_utils::is_wild; use clippy_utils::{has_non_exhaustive_attr, is_wild};
use rustc_hir::{Arm, PatKind}; use rustc_hir::{Arm, Expr, PatKind};
use rustc_lint::LateContext; use rustc_lint::LateContext;
use rustc_middle::ty;
use super::WILDCARD_IN_OR_PATTERNS; use super::WILDCARD_IN_OR_PATTERNS;
pub(crate) fn check(cx: &LateContext<'_>, arms: &[Arm<'_>]) { pub(crate) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, arms: &[Arm<'_>]) {
// first check if we are matching on an enum that has the non_exhaustive attribute
let ty = cx.typeck_results().expr_ty(expr).peel_refs();
if let ty::Adt(adt_def, _) = ty.kind()
&& has_non_exhaustive_attr(cx.tcx, *adt_def)
{
return;
};
for arm in arms { for arm in arms {
if let PatKind::Or(fields) = arm.pat.kind { if let PatKind::Or(fields) = arm.pat.kind {
// look for multiple fields in this arm that contains at least one Wild pattern // look for multiple fields in this arm that contains at least one Wild pattern

View File

@ -37,4 +37,72 @@ fn main() {
dbg!("matched (bar or) wild"); dbg!("matched (bar or) wild");
}, },
}; };
// shouldn't lint
#[non_exhaustive]
pub enum NonExhaustiveEnum<'a> {
Message(&'a str),
Quit(&'a str),
Other,
}
match NonExhaustiveEnum::Message("Pass") {
NonExhaustiveEnum::Message(_) => dbg!("message"),
NonExhaustiveEnum::Quit(_) => dbg!("quit"),
NonExhaustiveEnum::Other | _ => dbg!("wildcard"),
};
// should lint
enum ExhaustiveEnum {
Quit,
Write(String),
ChangeColor(i32, i32, i32),
}
match ExhaustiveEnum::ChangeColor(0, 160, 255) {
ExhaustiveEnum::Write(text) => {
dbg!("Write");
},
ExhaustiveEnum::ChangeColor(r, g, b) => {
dbg!("Change the color");
},
ExhaustiveEnum::Quit | _ => {
dbg!("Quit or other");
},
};
// shouldn't lint
#[non_exhaustive]
struct NonExhaustiveStruct {
a: u32,
b: u32,
c: u64,
}
let b = NonExhaustiveStruct { a: 5, b: 42, c: 342 };
match b {
NonExhaustiveStruct { a: 5, b: 42, .. } => {},
NonExhaustiveStruct { a: 0, b: 0, c: 128 } => {},
NonExhaustiveStruct { a: 0, b: 0, c: 128, .. } | _ => {},
}
// should lint
struct ExhaustiveStruct {
x: i32,
y: i32,
}
let p = ExhaustiveStruct { x: 0, y: 7 };
match p {
ExhaustiveStruct { x: 0, y: 0 } => {
dbg!("On the x axis at {x}");
},
ExhaustiveStruct { x: 0, y: 1 } => {
dbg!("On the y axis at {y}");
},
ExhaustiveStruct { x: 1, y: 1 } | _ => {
dbg!("On neither axis: ({x}, {y})");
},
}
} }

View File

@ -32,5 +32,21 @@ LL | _ | "bar" => {
| |
= help: consider handling `_` separately = help: consider handling `_` separately
error: aborting due to 4 previous errors error: wildcard pattern covers any other pattern as it will match anyway
--> tests/ui/wild_in_or_pats.rs:69:9
|
LL | ExhaustiveEnum::Quit | _ => {
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: consider handling `_` separately
error: wildcard pattern covers any other pattern as it will match anyway
--> tests/ui/wild_in_or_pats.rs:104:9
|
LL | ExhaustiveStruct { x: 1, y: 1 } | _ => {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: consider handling `_` separately
error: aborting due to 6 previous errors