[redundant_guards]: don't lint on floats

This commit is contained in:
y21 2023-08-08 17:19:53 +02:00
parent 5818225a89
commit f959ccc09b
4 changed files with 25 additions and 10 deletions

View file

@ -2,6 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
use clippy_utils::path_to_local; use clippy_utils::path_to_local;
use clippy_utils::source::snippet_with_applicability; use clippy_utils::source::snippet_with_applicability;
use clippy_utils::visitors::{for_each_expr, is_local_used}; use clippy_utils::visitors::{for_each_expr, is_local_used};
use rustc_ast::LitKind;
use rustc_errors::Applicability; use rustc_errors::Applicability;
use rustc_hir::def::{DefKind, Res}; use rustc_hir::def::{DefKind, Res};
use rustc_hir::{Arm, BinOpKind, Expr, ExprKind, Guard, MatchSource, Node, Pat, PatKind}; use rustc_hir::{Arm, BinOpKind, Expr, ExprKind, Guard, MatchSource, Node, Pat, PatKind};
@ -177,8 +178,8 @@ fn expr_can_be_pat(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
ExprKind::AddrOf(..) ExprKind::AddrOf(..)
| ExprKind::Array(..) | ExprKind::Array(..)
| ExprKind::Tup(..) | ExprKind::Tup(..)
| ExprKind::Struct(..) | ExprKind::Struct(..) => true,
| ExprKind::Lit(..) => true, ExprKind::Lit(lit) if !matches!(lit.node, LitKind::Float(..)) => true,
_ => false, _ => false,
} { } {
return ControlFlow::Continue(()); return ControlFlow::Continue(());

View file

@ -15,6 +15,13 @@ struct B {
struct C(u32, u32); struct C(u32, u32);
fn issue11304() {
match 0.1 {
x if x == 0.0 => todo!(),
_ => todo!(),
}
}
fn main() { fn main() {
let c = C(1, 2); let c = C(1, 2);
match c { match c {

View file

@ -15,6 +15,13 @@ struct B {
struct C(u32, u32); struct C(u32, u32);
fn issue11304() {
match 0.1 {
x if x == 0.0 => todo!(),
_ => todo!(),
}
}
fn main() { fn main() {
let c = C(1, 2); let c = C(1, 2);
match c { match c {

View file

@ -1,5 +1,5 @@
error: redundant guard error: redundant guard
--> $DIR/redundant_guards.rs:21:20 --> $DIR/redundant_guards.rs:28:20
| |
LL | C(x, y) if let 1 = y => .., LL | C(x, y) if let 1 = y => ..,
| ^^^^^^^^^ | ^^^^^^^^^
@ -12,7 +12,7 @@ LL + C(x, 1) => ..,
| |
error: redundant guard error: redundant guard
--> $DIR/redundant_guards.rs:27:20 --> $DIR/redundant_guards.rs:34:20
| |
LL | Some(x) if matches!(x, Some(1) if true) => .., LL | Some(x) if matches!(x, Some(1) if true) => ..,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -23,7 +23,7 @@ LL | Some(Some(1)) if true => ..,
| ~~~~~~~ ~~~~~~~ | ~~~~~~~ ~~~~~~~
error: redundant guard error: redundant guard
--> $DIR/redundant_guards.rs:28:20 --> $DIR/redundant_guards.rs:35:20
| |
LL | Some(x) if matches!(x, Some(1)) => { LL | Some(x) if matches!(x, Some(1)) => {
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
@ -35,7 +35,7 @@ LL + Some(Some(1)) => {
| |
error: redundant guard error: redundant guard
--> $DIR/redundant_guards.rs:32:20 --> $DIR/redundant_guards.rs:39:20
| |
LL | Some(x) if let Some(1) = x => .., LL | Some(x) if let Some(1) = x => ..,
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
@ -47,7 +47,7 @@ LL + Some(Some(1)) => ..,
| |
error: redundant guard error: redundant guard
--> $DIR/redundant_guards.rs:33:20 --> $DIR/redundant_guards.rs:40:20
| |
LL | Some(x) if x == Some(2) => .., LL | Some(x) if x == Some(2) => ..,
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
@ -59,7 +59,7 @@ LL + Some(Some(2)) => ..,
| |
error: redundant guard error: redundant guard
--> $DIR/redundant_guards.rs:56:20 --> $DIR/redundant_guards.rs:63:20
| |
LL | B { e } if matches!(e, Some(A(2))) => .., LL | B { e } if matches!(e, Some(A(2))) => ..,
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
@ -71,7 +71,7 @@ LL + B { e: Some(A(2)) } => ..,
| |
error: redundant guard error: redundant guard
--> $DIR/redundant_guards.rs:93:20 --> $DIR/redundant_guards.rs:100:20
| |
LL | E::A(y) if y == "not from an or pattern" => {}, LL | E::A(y) if y == "not from an or pattern" => {},
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -83,7 +83,7 @@ LL + E::A("not from an or pattern") => {},
| |
error: redundant guard error: redundant guard
--> $DIR/redundant_guards.rs:100:14 --> $DIR/redundant_guards.rs:107:14
| |
LL | x if matches!(x, Some(0)) => .., LL | x if matches!(x, Some(0)) => ..,
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^