2015-05-01 17:35:49 -05:00
|
|
|
//! Checks for needless boolean results of if-else expressions
|
|
|
|
//!
|
2015-05-04 00:17:15 -05:00
|
|
|
//! This lint is **warn** by default
|
2015-05-01 17:35:49 -05:00
|
|
|
|
2021-03-25 13:29:11 -05:00
|
|
|
use clippy_utils::diagnostics::{span_lint, span_lint_and_sugg};
|
|
|
|
use clippy_utils::source::snippet_with_applicability;
|
|
|
|
use clippy_utils::sugg::Sugg;
|
2023-05-05 10:45:49 -05:00
|
|
|
use clippy_utils::{
|
|
|
|
get_parent_node, is_else_clause, is_expn_of, peel_blocks, peel_blocks_with_stmt, span_extract_comment,
|
|
|
|
};
|
|
|
|
use clippy_utils::{higher, SpanlessEq};
|
2020-02-29 21:23:33 -06:00
|
|
|
use rustc_ast::ast::LitKind;
|
2018-12-29 09:04:45 -06:00
|
|
|
use rustc_errors::Applicability;
|
2021-12-17 06:40:22 -06:00
|
|
|
use rustc_hir::{BinOpKind, Block, Expr, ExprKind, HirId, Node, UnOp};
|
2020-01-12 00:08:41 -06:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2020-01-11 05:37:08 -06:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-01-04 04:00:00 -06:00
|
|
|
use rustc_span::source_map::Spanned;
|
2020-03-23 15:21:18 -05:00
|
|
|
use rustc_span::Span;
|
2015-05-01 17:35:49 -05:00
|
|
|
|
2018-03-28 08:24:26 -05:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for expressions of the form `if c { true } else {
|
2020-06-09 09:36:01 -05:00
|
|
|
/// false }` (or vice versa) and suggests using the condition directly.
|
2019-03-05 10:50:33 -06:00
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Redundant code.
|
2019-03-05 10:50:33 -06:00
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Known problems
|
|
|
|
/// Maybe false positives: Sometimes, the two branches are
|
2019-06-12 13:07:10 -05:00
|
|
|
/// painstakingly documented (which we, of course, do not detect), so they *may*
|
2019-03-05 10:50:33 -06:00
|
|
|
/// have some value. Even then, the documentation can be rewritten to match the
|
|
|
|
/// shorter code.
|
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Example
|
2022-06-16 10:39:06 -05:00
|
|
|
/// ```rust
|
|
|
|
/// # let x = true;
|
2019-03-05 10:50:33 -06:00
|
|
|
/// if x {
|
|
|
|
/// false
|
|
|
|
/// } else {
|
|
|
|
/// true
|
|
|
|
/// }
|
2022-06-16 10:39:06 -05:00
|
|
|
/// # ;
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```
|
2022-06-16 10:39:06 -05:00
|
|
|
///
|
|
|
|
/// Use instead:
|
|
|
|
/// ```rust
|
|
|
|
/// # let x = true;
|
2019-08-20 09:55:17 -05:00
|
|
|
/// !x
|
2022-06-16 10:39:06 -05:00
|
|
|
/// # ;
|
2019-08-20 09:55:17 -05:00
|
|
|
/// ```
|
2021-12-06 05:33:31 -06:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2018-11-27 14:49:09 -06:00
|
|
|
pub NEEDLESS_BOOL,
|
|
|
|
complexity,
|
2019-01-30 19:15:29 -06:00
|
|
|
"if-statements with plain booleans in the then- and else-clause, e.g., `if p { true } else { false }`"
|
2015-05-01 17:35:49 -05:00
|
|
|
}
|
|
|
|
|
2018-03-28 08:24:26 -05:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for expressions of the form `x == true`,
|
2019-03-05 10:50:33 -06:00
|
|
|
/// `x != true` and order comparisons such as `x < true` (or vice versa) and
|
|
|
|
/// suggest using the variable directly.
|
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Unnecessary code.
|
2019-03-05 10:50:33 -06:00
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Example
|
2019-08-02 01:13:54 -05:00
|
|
|
/// ```rust,ignore
|
2020-03-17 20:50:39 -05:00
|
|
|
/// if x == true {}
|
|
|
|
/// if y == false {}
|
|
|
|
/// ```
|
|
|
|
/// use `x` directly:
|
|
|
|
/// ```rust,ignore
|
|
|
|
/// if x {}
|
|
|
|
/// if !y {}
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```
|
2021-12-06 05:33:31 -06:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2016-02-09 13:10:22 -06:00
|
|
|
pub BOOL_COMPARISON,
|
2018-03-29 06:41:53 -05:00
|
|
|
complexity,
|
2019-01-30 19:15:29 -06:00
|
|
|
"comparing a variable to a boolean, e.g., `if x == true` or `if x != true`"
|
2016-02-09 13:10:22 -06:00
|
|
|
}
|
|
|
|
|
2023-05-05 10:45:49 -05:00
|
|
|
declare_clippy_lint! {
|
|
|
|
/// ### What it does
|
|
|
|
/// Checks for expressions of the form `if c { x = true } else { x = false }`
|
|
|
|
/// (or vice versa) and suggest assigning the variable directly from the
|
|
|
|
/// condition.
|
|
|
|
///
|
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Redundant code.
|
|
|
|
///
|
|
|
|
/// ### Example
|
|
|
|
/// ```rust,ignore
|
|
|
|
/// # fn must_keep(x: i32, y: i32) -> bool { x == y }
|
|
|
|
/// # let x = 32; let y = 10;
|
|
|
|
/// # let mut skip: bool;
|
|
|
|
/// if must_keep(x, y) {
|
|
|
|
/// skip = false;
|
|
|
|
/// } else {
|
|
|
|
/// skip = true;
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
/// Use instead:
|
|
|
|
/// ```rust,ignore
|
|
|
|
/// # fn must_keep(x: i32, y: i32) -> bool { x == y }
|
|
|
|
/// # let x = 32; let y = 10;
|
|
|
|
/// # let mut skip: bool;
|
|
|
|
/// skip = !must_keep(x, y);
|
|
|
|
/// ```
|
|
|
|
#[clippy::version = "1.69.0"]
|
|
|
|
pub NEEDLESS_BOOL_ASSIGN,
|
|
|
|
complexity,
|
|
|
|
"setting the same boolean variable in both branches of an if-statement"
|
|
|
|
}
|
|
|
|
declare_lint_pass!(NeedlessBool => [NEEDLESS_BOOL, NEEDLESS_BOOL_ASSIGN]);
|
2015-08-11 13:22:20 -05:00
|
|
|
|
2021-12-17 06:40:22 -06:00
|
|
|
fn condition_needs_parentheses(e: &Expr<'_>) -> bool {
|
|
|
|
let mut inner = e;
|
|
|
|
while let ExprKind::Binary(_, i, _)
|
|
|
|
| ExprKind::Call(i, _)
|
|
|
|
| ExprKind::Cast(i, _)
|
|
|
|
| ExprKind::Type(i, _)
|
|
|
|
| ExprKind::Index(i, _) = inner.kind
|
|
|
|
{
|
|
|
|
if matches!(
|
|
|
|
i.kind,
|
|
|
|
ExprKind::Block(..)
|
|
|
|
| ExprKind::ConstBlock(..)
|
|
|
|
| ExprKind::If(..)
|
|
|
|
| ExprKind::Loop(..)
|
|
|
|
| ExprKind::Match(..)
|
|
|
|
) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
inner = i;
|
|
|
|
}
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
|
|
|
fn is_parent_stmt(cx: &LateContext<'_>, id: HirId) -> bool {
|
|
|
|
matches!(
|
|
|
|
get_parent_node(cx.tcx, id),
|
|
|
|
Some(Node::Stmt(..) | Node::Block(Block { stmts: &[], .. }))
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for NeedlessBool {
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
|
2020-02-21 02:39:38 -06:00
|
|
|
use self::Expression::{Bool, RetBool};
|
2021-07-15 03:44:10 -05:00
|
|
|
if e.span.from_expansion() {
|
|
|
|
return;
|
|
|
|
}
|
2021-08-08 09:49:13 -05:00
|
|
|
if let Some(higher::If {
|
|
|
|
cond,
|
|
|
|
then,
|
|
|
|
r#else: Some(r#else),
|
|
|
|
}) = higher::If::hir(e)
|
|
|
|
{
|
2016-07-03 18:17:31 -05:00
|
|
|
let reduce = |ret, not| {
|
2018-11-27 08:13:57 -06:00
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
2021-08-08 09:49:13 -05:00
|
|
|
let snip = Sugg::hir_with_applicability(cx, cond, "<predicate>", &mut applicability);
|
2019-01-22 05:33:47 -06:00
|
|
|
let mut snip = if not { !snip } else { snip };
|
2016-07-03 18:17:31 -05:00
|
|
|
|
2019-01-22 05:33:47 -06:00
|
|
|
if ret {
|
|
|
|
snip = snip.make_return();
|
|
|
|
}
|
2016-07-03 18:17:31 -05:00
|
|
|
|
2021-04-22 04:31:13 -05:00
|
|
|
if is_else_clause(cx.tcx, e) {
|
2021-06-03 01:41:37 -05:00
|
|
|
snip = snip.blockify();
|
2019-01-20 09:15:00 -06:00
|
|
|
}
|
|
|
|
|
2021-12-17 06:40:22 -06:00
|
|
|
if condition_needs_parentheses(cond) && is_parent_stmt(cx, e.hir_id) {
|
|
|
|
snip = snip.maybe_par();
|
|
|
|
}
|
|
|
|
|
2017-08-09 02:30:56 -05:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_BOOL,
|
|
|
|
e.span,
|
|
|
|
"this if-then-else expression returns a bool literal",
|
|
|
|
"you can reduce it to",
|
2019-01-22 05:33:47 -06:00
|
|
|
snip.to_string(),
|
2018-11-27 08:13:57 -06:00
|
|
|
applicability,
|
2017-08-09 02:30:56 -05:00
|
|
|
);
|
2016-03-14 10:41:41 -05:00
|
|
|
};
|
2021-12-17 06:40:22 -06:00
|
|
|
if let Some((a, b)) = fetch_bool_block(then).and_then(|a| Some((a, fetch_bool_block(r#else)?))) {
|
|
|
|
match (a, b) {
|
2017-09-05 04:33:04 -05:00
|
|
|
(RetBool(true), RetBool(true)) | (Bool(true), Bool(true)) => {
|
2017-08-09 02:30:56 -05:00
|
|
|
span_lint(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_BOOL,
|
|
|
|
e.span,
|
|
|
|
"this if-then-else expression will always return true",
|
|
|
|
);
|
2017-04-12 04:06:32 -05:00
|
|
|
},
|
2017-09-05 04:33:04 -05:00
|
|
|
(RetBool(false), RetBool(false)) | (Bool(false), Bool(false)) => {
|
2017-08-09 02:30:56 -05:00
|
|
|
span_lint(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_BOOL,
|
|
|
|
e.span,
|
|
|
|
"this if-then-else expression will always return false",
|
|
|
|
);
|
2017-04-12 04:06:32 -05:00
|
|
|
},
|
|
|
|
(RetBool(true), RetBool(false)) => reduce(true, false),
|
|
|
|
(Bool(true), Bool(false)) => reduce(false, false),
|
|
|
|
(RetBool(false), RetBool(true)) => reduce(true, true),
|
|
|
|
(Bool(false), Bool(true)) => reduce(false, true),
|
|
|
|
_ => (),
|
|
|
|
}
|
2017-03-31 16:46:08 -05:00
|
|
|
}
|
2023-05-05 10:45:49 -05:00
|
|
|
if let Some((lhs_a, a)) = fetch_assign(then) &&
|
|
|
|
let Some((lhs_b, b)) = fetch_assign(r#else) &&
|
|
|
|
SpanlessEq::new(cx).eq_expr(lhs_a, lhs_b) &&
|
|
|
|
span_extract_comment(cx.tcx.sess.source_map(), e.span).is_empty()
|
|
|
|
{
|
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
|
|
|
let cond = Sugg::hir_with_applicability(cx, cond, "..", &mut applicability);
|
|
|
|
let lhs = snippet_with_applicability(cx, lhs_a.span, "..", &mut applicability);
|
|
|
|
let sugg = if a == b {
|
|
|
|
format!("{cond}; {lhs} = {a:?};")
|
|
|
|
} else {
|
|
|
|
format!("{lhs} = {};", if a { cond } else { !cond })
|
|
|
|
};
|
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_BOOL_ASSIGN,
|
|
|
|
e.span,
|
|
|
|
"this if-then-else expression assigns a bool literal",
|
|
|
|
"you can reduce it to",
|
|
|
|
sugg,
|
|
|
|
applicability
|
|
|
|
);
|
|
|
|
}
|
2015-08-11 13:22:20 -05:00
|
|
|
}
|
2015-05-01 17:35:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-08 15:43:55 -05:00
|
|
|
declare_lint_pass!(BoolComparison => [BOOL_COMPARISON]);
|
2016-02-09 13:10:22 -06:00
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for BoolComparison {
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
|
2019-08-19 11:30:32 -05:00
|
|
|
if e.span.from_expansion() {
|
2018-10-29 16:23:45 -05:00
|
|
|
return;
|
|
|
|
}
|
2018-11-02 06:12:14 -05:00
|
|
|
|
2019-09-27 10:16:06 -05:00
|
|
|
if let ExprKind::Binary(Spanned { node, .. }, ..) = e.kind {
|
2018-12-06 18:50:16 -06:00
|
|
|
let ignore_case = None::<(fn(_) -> _, &str)>;
|
|
|
|
let ignore_no_literal = None::<(fn(_, _) -> _, &str)>;
|
2018-11-30 07:21:11 -06:00
|
|
|
match node {
|
2018-12-06 18:50:16 -06:00
|
|
|
BinOpKind::Eq => {
|
|
|
|
let true_case = Some((|h| h, "equality checks against true are unnecessary"));
|
|
|
|
let false_case = Some((
|
2021-12-30 08:10:43 -06:00
|
|
|
|h: Sugg<'tcx>| !h,
|
2018-12-06 18:50:16 -06:00
|
|
|
"equality checks against false can be replaced by a negation",
|
|
|
|
));
|
2021-06-03 01:41:37 -05:00
|
|
|
check_comparison(cx, e, true_case, false_case, true_case, false_case, ignore_no_literal);
|
2018-12-06 18:50:16 -06:00
|
|
|
},
|
|
|
|
BinOpKind::Ne => {
|
|
|
|
let true_case = Some((
|
2021-12-30 08:10:43 -06:00
|
|
|
|h: Sugg<'tcx>| !h,
|
2018-12-06 18:50:16 -06:00
|
|
|
"inequality checks against true can be replaced by a negation",
|
|
|
|
));
|
|
|
|
let false_case = Some((|h| h, "inequality checks against false are unnecessary"));
|
2021-06-03 01:41:37 -05:00
|
|
|
check_comparison(cx, e, true_case, false_case, true_case, false_case, ignore_no_literal);
|
2018-12-06 18:50:16 -06:00
|
|
|
},
|
|
|
|
BinOpKind::Lt => check_comparison(
|
2018-11-30 07:21:11 -06:00
|
|
|
cx,
|
|
|
|
e,
|
2018-12-06 18:50:16 -06:00
|
|
|
ignore_case,
|
|
|
|
Some((|h| h, "greater than checks against false are unnecessary")),
|
|
|
|
Some((
|
2021-12-30 08:10:43 -06:00
|
|
|
|h: Sugg<'tcx>| !h,
|
2018-12-06 18:50:16 -06:00
|
|
|
"less than comparison against true can be replaced by a negation",
|
|
|
|
)),
|
|
|
|
ignore_case,
|
|
|
|
Some((
|
2021-12-30 08:10:43 -06:00
|
|
|
|l: Sugg<'tcx>, r: Sugg<'tcx>| (!l).bit_and(&r),
|
2018-12-06 18:50:16 -06:00
|
|
|
"order comparisons between booleans can be simplified",
|
|
|
|
)),
|
2018-11-30 07:21:11 -06:00
|
|
|
),
|
2018-12-06 18:50:16 -06:00
|
|
|
BinOpKind::Gt => check_comparison(
|
2018-11-30 07:21:11 -06:00
|
|
|
cx,
|
|
|
|
e,
|
2018-12-06 18:50:16 -06:00
|
|
|
Some((
|
2021-12-30 08:10:43 -06:00
|
|
|
|h: Sugg<'tcx>| !h,
|
2018-12-06 18:50:16 -06:00
|
|
|
"less than comparison against true can be replaced by a negation",
|
|
|
|
)),
|
|
|
|
ignore_case,
|
|
|
|
ignore_case,
|
|
|
|
Some((|h| h, "greater than checks against false are unnecessary")),
|
|
|
|
Some((
|
2021-12-30 08:10:43 -06:00
|
|
|
|l: Sugg<'tcx>, r: Sugg<'tcx>| l.bit_and(&(!r)),
|
2018-12-06 18:50:16 -06:00
|
|
|
"order comparisons between booleans can be simplified",
|
|
|
|
)),
|
2018-11-30 07:21:11 -06:00
|
|
|
),
|
2018-10-29 16:23:45 -05:00
|
|
|
_ => (),
|
2016-02-09 13:10:22 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-23 15:21:18 -05:00
|
|
|
struct ExpressionInfoWithSpan {
|
|
|
|
one_side_is_unary_not: bool,
|
|
|
|
left_span: Span,
|
|
|
|
right_span: Span,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn is_unary_not(e: &Expr<'_>) -> (bool, Span) {
|
2021-02-09 02:15:53 -06:00
|
|
|
if let ExprKind::Unary(UnOp::Not, operand) = e.kind {
|
2020-12-06 08:01:03 -06:00
|
|
|
return (true, operand.span);
|
|
|
|
}
|
2020-03-23 15:00:02 -05:00
|
|
|
(false, e.span)
|
2020-03-23 14:29:12 -05:00
|
|
|
}
|
|
|
|
|
2020-03-23 15:21:18 -05:00
|
|
|
fn one_side_is_unary_not<'tcx>(left_side: &'tcx Expr<'_>, right_side: &'tcx Expr<'_>) -> ExpressionInfoWithSpan {
|
2020-03-23 15:00:02 -05:00
|
|
|
let left = is_unary_not(left_side);
|
|
|
|
let right = is_unary_not(right_side);
|
|
|
|
|
2020-03-23 15:21:18 -05:00
|
|
|
ExpressionInfoWithSpan {
|
2020-03-30 14:19:30 -05:00
|
|
|
one_side_is_unary_not: left.0 != right.0,
|
2020-03-23 15:21:18 -05:00
|
|
|
left_span: left.1,
|
|
|
|
right_span: right.1,
|
|
|
|
}
|
2020-03-23 14:29:12 -05:00
|
|
|
}
|
|
|
|
|
2018-11-30 07:21:11 -06:00
|
|
|
fn check_comparison<'a, 'tcx>(
|
2020-06-25 15:41:36 -05:00
|
|
|
cx: &LateContext<'tcx>,
|
2019-12-27 01:12:26 -06:00
|
|
|
e: &'tcx Expr<'_>,
|
2018-12-06 18:50:16 -06:00
|
|
|
left_true: Option<(impl FnOnce(Sugg<'a>) -> Sugg<'a>, &str)>,
|
|
|
|
left_false: Option<(impl FnOnce(Sugg<'a>) -> Sugg<'a>, &str)>,
|
|
|
|
right_true: Option<(impl FnOnce(Sugg<'a>) -> Sugg<'a>, &str)>,
|
|
|
|
right_false: Option<(impl FnOnce(Sugg<'a>) -> Sugg<'a>, &str)>,
|
|
|
|
no_literal: Option<(impl FnOnce(Sugg<'a>, Sugg<'a>) -> Sugg<'a>, &str)>,
|
2018-11-30 07:21:11 -06:00
|
|
|
) {
|
2021-04-08 10:50:13 -05:00
|
|
|
if let ExprKind::Binary(op, left_side, right_side) = e.kind {
|
2020-07-17 03:47:04 -05:00
|
|
|
let (l_ty, r_ty) = (
|
|
|
|
cx.typeck_results().expr_ty(left_side),
|
|
|
|
cx.typeck_results().expr_ty(right_side),
|
|
|
|
);
|
2020-10-28 17:36:07 -05:00
|
|
|
if is_expn_of(left_side.span, "cfg").is_some() || is_expn_of(right_side.span, "cfg").is_some() {
|
|
|
|
return;
|
|
|
|
}
|
2019-02-25 14:48:20 -06:00
|
|
|
if l_ty.is_bool() && r_ty.is_bool() {
|
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
2020-03-23 15:00:02 -05:00
|
|
|
|
2021-10-07 04:21:30 -05:00
|
|
|
if op.node == BinOpKind::Eq {
|
2021-04-08 10:50:13 -05:00
|
|
|
let expression_info = one_side_is_unary_not(left_side, right_side);
|
2020-03-23 15:21:18 -05:00
|
|
|
if expression_info.one_side_is_unary_not {
|
2020-03-23 15:00:02 -05:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
BOOL_COMPARISON,
|
|
|
|
e.span,
|
2020-08-11 08:43:21 -05:00
|
|
|
"this comparison might be written more concisely",
|
2020-03-23 15:00:02 -05:00
|
|
|
"try simplifying it as shown",
|
2020-03-23 15:21:18 -05:00
|
|
|
format!(
|
|
|
|
"{} != {}",
|
|
|
|
snippet_with_applicability(cx, expression_info.left_span, "..", &mut applicability),
|
|
|
|
snippet_with_applicability(cx, expression_info.right_span, "..", &mut applicability)
|
|
|
|
),
|
2020-03-23 15:00:02 -05:00
|
|
|
applicability,
|
2021-06-03 01:41:37 -05:00
|
|
|
);
|
2020-03-23 15:00:02 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-25 14:48:20 -06:00
|
|
|
match (fetch_bool_expr(left_side), fetch_bool_expr(right_side)) {
|
2021-12-17 06:40:22 -06:00
|
|
|
(Some(true), None) => left_true.map_or((), |(h, m)| {
|
2021-06-03 01:41:37 -05:00
|
|
|
suggest_bool_comparison(cx, e, right_side, applicability, m, h);
|
2019-02-25 14:48:20 -06:00
|
|
|
}),
|
2021-12-17 06:40:22 -06:00
|
|
|
(None, Some(true)) => right_true.map_or((), |(h, m)| {
|
2021-06-03 01:41:37 -05:00
|
|
|
suggest_bool_comparison(cx, e, left_side, applicability, m, h);
|
2019-02-25 14:48:20 -06:00
|
|
|
}),
|
2021-12-17 06:40:22 -06:00
|
|
|
(Some(false), None) => left_false.map_or((), |(h, m)| {
|
2021-06-03 01:41:37 -05:00
|
|
|
suggest_bool_comparison(cx, e, right_side, applicability, m, h);
|
2019-02-25 14:48:20 -06:00
|
|
|
}),
|
2021-12-17 06:40:22 -06:00
|
|
|
(None, Some(false)) => right_false.map_or((), |(h, m)| {
|
2021-06-03 01:41:37 -05:00
|
|
|
suggest_bool_comparison(cx, e, left_side, applicability, m, h);
|
2019-02-25 14:48:20 -06:00
|
|
|
}),
|
2021-12-17 06:40:22 -06:00
|
|
|
(None, None) => no_literal.map_or((), |(h, m)| {
|
2018-12-06 18:50:16 -06:00
|
|
|
let left_side = Sugg::hir_with_applicability(cx, left_side, "..", &mut applicability);
|
|
|
|
let right_side = Sugg::hir_with_applicability(cx, right_side, "..", &mut applicability);
|
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
BOOL_COMPARISON,
|
|
|
|
e.span,
|
|
|
|
m,
|
|
|
|
"try simplifying it as shown",
|
|
|
|
h(left_side, right_side).to_string(),
|
|
|
|
applicability,
|
2021-06-03 01:41:37 -05:00
|
|
|
);
|
2019-02-25 14:48:20 -06:00
|
|
|
}),
|
|
|
|
_ => (),
|
|
|
|
}
|
2018-11-30 07:21:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn suggest_bool_comparison<'a, 'tcx>(
|
2020-06-25 15:41:36 -05:00
|
|
|
cx: &LateContext<'tcx>,
|
2019-12-27 01:12:26 -06:00
|
|
|
e: &'tcx Expr<'_>,
|
|
|
|
expr: &Expr<'_>,
|
2023-03-24 08:04:35 -05:00
|
|
|
mut app: Applicability,
|
2018-11-30 07:21:11 -06:00
|
|
|
message: &str,
|
2018-12-06 18:50:16 -06:00
|
|
|
conv_hint: impl FnOnce(Sugg<'a>) -> Sugg<'a>,
|
2018-11-30 07:21:11 -06:00
|
|
|
) {
|
2023-03-24 08:04:35 -05:00
|
|
|
let hint = Sugg::hir_with_context(cx, expr, e.span.ctxt(), "..", &mut app);
|
2018-11-30 07:21:11 -06:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
BOOL_COMPARISON,
|
|
|
|
e.span,
|
|
|
|
message,
|
|
|
|
"try simplifying it as shown",
|
|
|
|
conv_hint(hint).to_string(),
|
2023-03-24 08:04:35 -05:00
|
|
|
app,
|
2018-11-30 07:21:11 -06:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2016-03-14 10:41:41 -05:00
|
|
|
enum Expression {
|
|
|
|
Bool(bool),
|
|
|
|
RetBool(bool),
|
|
|
|
}
|
|
|
|
|
2021-12-17 06:40:22 -06:00
|
|
|
fn fetch_bool_block(expr: &Expr<'_>) -> Option<Expression> {
|
|
|
|
match peel_blocks_with_stmt(expr).kind {
|
|
|
|
ExprKind::Ret(Some(ret)) => Some(Expression::RetBool(fetch_bool_expr(ret)?)),
|
|
|
|
_ => Some(Expression::Bool(fetch_bool_expr(expr)?)),
|
2016-01-03 22:26:12 -06:00
|
|
|
}
|
2015-05-01 17:35:49 -05:00
|
|
|
}
|
2015-08-11 13:22:20 -05:00
|
|
|
|
2021-12-17 06:40:22 -06:00
|
|
|
fn fetch_bool_expr(expr: &Expr<'_>) -> Option<bool> {
|
2023-05-05 10:45:49 -05:00
|
|
|
if let ExprKind::Lit(lit_ptr) = peel_blocks(expr).kind {
|
2021-12-17 06:40:22 -06:00
|
|
|
if let LitKind::Bool(value) = lit_ptr.node {
|
|
|
|
return Some(value);
|
|
|
|
}
|
2015-08-11 13:22:20 -05:00
|
|
|
}
|
2021-12-17 06:40:22 -06:00
|
|
|
None
|
2015-05-01 17:35:49 -05:00
|
|
|
}
|
2023-05-05 10:45:49 -05:00
|
|
|
|
|
|
|
fn fetch_assign<'tcx>(expr: &'tcx Expr<'tcx>) -> Option<(&'tcx Expr<'tcx>, bool)> {
|
|
|
|
if let ExprKind::Assign(lhs, rhs, _) = peel_blocks_with_stmt(expr).kind {
|
|
|
|
fetch_bool_expr(rhs).map(|b| (lhs, b))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|