Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-24 05:33:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix FP of manual_range_contains in const fn

Browse source
This commit is contained in:
Takayuki Nakata 2020-11-25 17:07:50 +09:00
parent 27fd6ed581
commit 26c61c7e49
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clippy_lints/src/ranges.rs
View file

@ -14,7 +14,7 @@ use std::cmp::Ordering;
use crate::utils::sugg::Sugg; use crate::utils::sugg::Sugg;
use crate::utils::{ use crate::utils::{
get_parent_expr, is_integer_const, meets_msrv, single_segment_path, snippet, snippet_opt, get_parent_expr, in_constant, is_integer_const, meets_msrv, single_segment_path, snippet, snippet_opt,
snippet_with_applicability, span_lint, span_lint_and_sugg, span_lint_and_then, snippet_with_applicability, span_lint, span_lint_and_sugg, span_lint_and_then,
}; };
use crate::utils::{higher, SpanlessEq}; use crate::utils::{higher, SpanlessEq};
@ -190,7 +190,7 @@ impl<'tcx> LateLintPass<'tcx> for Ranges {
}, },
ExprKind::Binary(ref op, ref l, ref r) => { ExprKind::Binary(ref op, ref l, ref r) => {
if meets_msrv(self.msrv.as_ref(), &MANUAL_RANGE_CONTAINS_MSRV) { if meets_msrv(self.msrv.as_ref(), &MANUAL_RANGE_CONTAINS_MSRV) {
check_possible_range_contains(cx, op.node, l, r, expr.span); check_possible_range_contains(cx, op.node, l, r, expr);
} }
}, },
_ => {}, _ => {},
@ -203,7 +203,12 @@ impl<'tcx> LateLintPass<'tcx> for Ranges {
extract_msrv_attr!(LateContext); extract_msrv_attr!(LateContext);
} }
fn check_possible_range_contains(cx: &LateContext<'_>, op: BinOpKind, l: &Expr<'_>, r: &Expr<'_>, span: Span) { fn check_possible_range_contains(cx: &LateContext<'_>, op: BinOpKind, l: &Expr<'_>, r: &Expr<'_>, expr: &Expr<'_>) {
if in_constant(cx, expr.hir_id) {
return;
}
let span = expr.span;
let combine_and = match op { let combine_and = match op {
BinOpKind::And | BinOpKind::BitAnd => true, BinOpKind::And | BinOpKind::BitAnd => true,
BinOpKind::Or | BinOpKind::BitOr => false, BinOpKind::Or | BinOpKind::BitOr => false,

5
tests/ui/range_contains.fixed
View file

@ -44,3 +44,8 @@ fn main() {
(0. ..1.).contains(&y); (0. ..1.).contains(&y);
!(0. ..=1.).contains(&y); !(0. ..=1.).contains(&y);
} }
// Fix #6373
pub const fn in_range(a: i32) -> bool {
3 <= a && a <= 20
}

5
tests/ui/range_contains.rs
View file

@ -44,3 +44,8 @@ fn main() {
y >= 0. && y < 1.; y >= 0. && y < 1.;
y < 0. || y > 1.; y < 0. || y > 1.;
} }
// Fix #6373
pub const fn in_range(a: i32) -> bool {
3 <= a && a <= 20
}