rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Split check_fn function

Browse Source
This commit is contained in:
Marcin Serwin
2020-04-06 09:40:53 +02:00
parent f637c45f8b
commit 4e01ca35a0
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
clippy_lints/src/misc.rs
View File

@@ -370,30 +370,17 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MiscLints {
} }
} }
let is_comparing_arrays = is_array(cx, left) || is_array(cx, right); let is_comparing_arrays = is_array(cx, left) || is_array(cx, right);
let (lint, msg) = if is_named_constant(cx, left) || is_named_constant(cx, right) { let (lint, msg) = get_lint_and_message(
( is_named_constant(cx, left) || is_named_constant(cx, right),
FLOAT_CMP_CONST, is_comparing_arrays,
if is_comparing_arrays { );
"strict comparison of `f32` or `f64` constant arrays"
} else {
"strict comparison of `f32` or `f64` constant"
},
)
} else {
(
FLOAT_CMP,
if is_comparing_arrays {
"strict comparison of `f32` or `f64` arrays"
} else {
"strict comparison of `f32` or `f64`"
},
)
};
span_lint_and_then(cx, lint, expr.span, msg, |db| { span_lint_and_then(cx, lint, expr.span, msg, |db| {
let lhs = Sugg::hir(cx, left, ".."); let lhs = Sugg::hir(cx, left, "..");
let rhs = Sugg::hir(cx, right, ".."); let rhs = Sugg::hir(cx, right, "..");
if !is_comparing_arrays { if is_comparing_arrays {
db.note("`std::f32::EPSILON` and `std::f64::EPSILON` are available.");
} else {
db.span_suggestion( db.span_suggestion(
expr.span, expr.span,
"consider comparing them within some error", "consider comparing them within some error",
@@ -405,8 +392,6 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MiscLints {
Applicability::HasPlaceholders, // snippet Applicability::HasPlaceholders, // snippet
); );
db.span_note(expr.span, "`f32::EPSILON` and `f64::EPSILON` are available."); db.span_note(expr.span, "`f32::EPSILON` and `f64::EPSILON` are available.");
} else {
db.note("`f32::EPSILON` and `f64::EPSILON` are available.");
} }
}); });
} else if op == BinOpKind::Rem && is_integer_const(cx, right, 1) { } else if op == BinOpKind::Rem && is_integer_const(cx, right, 1) {
@@ -459,6 +444,31 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MiscLints {
} }
} }
fn get_lint_and_message(
is_comparing_constants: bool,
is_comparing_arrays: bool,
) -> (&'static rustc_lint::Lint, &'static str) {
if is_comparing_constants {
(
FLOAT_CMP_CONST,
if is_comparing_arrays {
"strict comparison of `f32` or `f64` constant arrays"
} else {
"strict comparison of `f32` or `f64` constant"
},
)
} else {
(
FLOAT_CMP,
if is_comparing_arrays {
"strict comparison of `f32` or `f64` arrays"
} else {
"strict comparison of `f32` or `f64`"
},
)
}
}
fn check_nan(cx: &LateContext<'_, '_>, expr: &Expr<'_>, cmp_expr: &Expr<'_>) { fn check_nan(cx: &LateContext<'_, '_>, expr: &Expr<'_>, cmp_expr: &Expr<'_>) {
if_chain! { if_chain! {
if !in_constant(cx, cmp_expr.hir_id); if !in_constant(cx, cmp_expr.hir_id);