Skip to content

Commit f959ccc

Browse files
committed
[redundant_guards]: don't lint on floats
1 parent 5818225 commit f959ccc

File tree

4 files changed

+25
-10
lines changed

4 files changed

+25
-10
lines changed

clippy_lints/src/matches/redundant_guards.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
22
use clippy_utils::path_to_local;
33
use clippy_utils::source::snippet_with_applicability;
44
use clippy_utils::visitors::{for_each_expr, is_local_used};
5+
use rustc_ast::LitKind;
56
use rustc_errors::Applicability;
67
use rustc_hir::def::{DefKind, Res};
78
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 {
177178
ExprKind::AddrOf(..)
178179
| ExprKind::Array(..)
179180
| ExprKind::Tup(..)
180-
| ExprKind::Struct(..)
181-
| ExprKind::Lit(..) => true,
181+
| ExprKind::Struct(..) => true,
182+
ExprKind::Lit(lit) if !matches!(lit.node, LitKind::Float(..)) => true,
182183
_ => false,
183184
} {
184185
return ControlFlow::Continue(());

tests/ui/redundant_guards.fixed

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ struct B {
1515

1616
struct C(u32, u32);
1717

18+
fn issue11304() {
19+
match 0.1 {
20+
x if x == 0.0 => todo!(),
21+
_ => todo!(),
22+
}
23+
}
24+
1825
fn main() {
1926
let c = C(1, 2);
2027
match c {

tests/ui/redundant_guards.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ struct B {
1515

1616
struct C(u32, u32);
1717

18+
fn issue11304() {
19+
match 0.1 {
20+
x if x == 0.0 => todo!(),
21+
_ => todo!(),
22+
}
23+
}
24+
1825
fn main() {
1926
let c = C(1, 2);
2027
match c {

tests/ui/redundant_guards.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: redundant guard
2-
--> $DIR/redundant_guards.rs:21:20
2+
--> $DIR/redundant_guards.rs:28:20
33
|
44
LL | C(x, y) if let 1 = y => ..,
55
| ^^^^^^^^^
@@ -12,7 +12,7 @@ LL + C(x, 1) => ..,
1212
|
1313

1414
error: redundant guard
15-
--> $DIR/redundant_guards.rs:27:20
15+
--> $DIR/redundant_guards.rs:34:20
1616
|
1717
LL | Some(x) if matches!(x, Some(1) if true) => ..,
1818
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -23,7 +23,7 @@ LL | Some(Some(1)) if true => ..,
2323
| ~~~~~~~ ~~~~~~~
2424

2525
error: redundant guard
26-
--> $DIR/redundant_guards.rs:28:20
26+
--> $DIR/redundant_guards.rs:35:20
2727
|
2828
LL | Some(x) if matches!(x, Some(1)) => {
2929
| ^^^^^^^^^^^^^^^^^^^^
@@ -35,7 +35,7 @@ LL + Some(Some(1)) => {
3535
|
3636

3737
error: redundant guard
38-
--> $DIR/redundant_guards.rs:32:20
38+
--> $DIR/redundant_guards.rs:39:20
3939
|
4040
LL | Some(x) if let Some(1) = x => ..,
4141
| ^^^^^^^^^^^^^^^
@@ -47,7 +47,7 @@ LL + Some(Some(1)) => ..,
4747
|
4848

4949
error: redundant guard
50-
--> $DIR/redundant_guards.rs:33:20
50+
--> $DIR/redundant_guards.rs:40:20
5151
|
5252
LL | Some(x) if x == Some(2) => ..,
5353
| ^^^^^^^^^^^^
@@ -59,7 +59,7 @@ LL + Some(Some(2)) => ..,
5959
|
6060

6161
error: redundant guard
62-
--> $DIR/redundant_guards.rs:56:20
62+
--> $DIR/redundant_guards.rs:63:20
6363
|
6464
LL | B { e } if matches!(e, Some(A(2))) => ..,
6565
| ^^^^^^^^^^^^^^^^^^^^^^^
@@ -71,7 +71,7 @@ LL + B { e: Some(A(2)) } => ..,
7171
|
7272

7373
error: redundant guard
74-
--> $DIR/redundant_guards.rs:93:20
74+
--> $DIR/redundant_guards.rs:100:20
7575
|
7676
LL | E::A(y) if y == "not from an or pattern" => {},
7777
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -83,7 +83,7 @@ LL + E::A("not from an or pattern") => {},
8383
|
8484

8585
error: redundant guard
86-
--> $DIR/redundant_guards.rs:100:14
86+
--> $DIR/redundant_guards.rs:107:14
8787
|
8888
LL | x if matches!(x, Some(0)) => ..,
8989
| ^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)