squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #6382 - giraffate:fix_fp_in_manual_range_contains_when_const_fn, r=llogiq

Browse source 
Fix FP of `manual_range_contains` in `const fn`

Fix #6373.

changelog: Fix FP of `manual_range_contains` in `const fn`
This commit is contained in:
bors 2020-12-12 21:09:20 +00:00
commit 3b89a672e2
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::{
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,
};
use crate::utils::{higher, SpanlessEq};
@ -190,7 +190,7 @@ impl<'tcx> LateLintPass<'tcx> for Ranges {
},
ExprKind::Binary(ref op, ref l, ref r) => {
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);
}
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 {
BinOpKind::And | BinOpKind::BitAnd => true,
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);
}
// 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.;
}
// Fix #6373
pub const fn in_range(a: i32) -> bool {
3 <= a && a <= 20
}