2015-05-01 22:35:49 +00:00
|
|
|
//! Checks for needless boolean results of if-else expressions
|
|
|
|
//!
|
2015-05-04 05:17:15 +00:00
|
|
|
//! This lint is **warn** by default
|
2015-05-01 22:35:49 +00:00
|
|
|
|
2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::diagnostics::{span_lint, span_lint_and_sugg};
|
2021-08-08 14:49:13 +00:00
|
|
|
use clippy_utils::higher;
|
2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::source::snippet_with_applicability;
|
|
|
|
use clippy_utils::sugg::Sugg;
|
2021-12-02 21:47:57 +00:00
|
|
|
use clippy_utils::{get_parent_node, is_else_clause, is_expn_of};
|
2020-03-01 03:23:33 +00:00
|
|
|
use rustc_ast::ast::LitKind;
|
2018-12-29 15:04:45 +00:00
|
|
|
use rustc_errors::Applicability;
|
2021-12-02 21:47:57 +00:00
|
|
|
use rustc_hir::{BinOpKind, Block, Expr, ExprKind, HirId, Node, StmtKind, UnOp};
|
2020-01-12 06:08:41 +00:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2020-01-11 11:37:08 +00:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-01-04 10:00:00 +00:00
|
|
|
use rustc_span::source_map::Spanned;
|
2020-03-23 20:21:18 +00:00
|
|
|
use rustc_span::Span;
|
2015-05-01 22:35:49 +00:00
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for expressions of the form `if c { true } else {
|
2020-06-09 14:36:01 +00:00
|
|
|
/// false }` (or vice versa) and suggests using the condition directly.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Redundant code.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Known problems
|
|
|
|
/// Maybe false positives: Sometimes, the two branches are
|
2019-06-12 18:07:10 +00:00
|
|
|
/// painstakingly documented (which we, of course, do not detect), so they *may*
|
2019-03-05 16:50:33 +00:00
|
|
|
/// have some value. Even then, the documentation can be rewritten to match the
|
|
|
|
/// shorter code.
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2019-08-02 06:13:54 +00:00
|
|
|
/// ```rust,ignore
|
2019-03-05 16:50:33 +00:00
|
|
|
/// if x {
|
|
|
|
/// false
|
|
|
|
/// } else {
|
|
|
|
/// true
|
|
|
|
/// }
|
|
|
|
/// ```
|
2019-08-20 14:55:17 +00:00
|
|
|
/// Could be written as
|
|
|
|
/// ```rust,ignore
|
|
|
|
/// !x
|
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 19:06:26 +00:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2018-11-27 20:49:09 +00:00
|
|
|
pub NEEDLESS_BOOL,
|
|
|
|
complexity,
|
2019-01-31 01:15:29 +00:00
|
|
|
"if-statements with plain booleans in the then- and else-clause, e.g., `if p { true } else { false }`"
|
2015-05-01 22:35:49 +00:00
|
|
|
}
|
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for expressions of the form `x == true`,
|
2019-03-05 16:50:33 +00:00
|
|
|
/// `x != true` and order comparisons such as `x < true` (or vice versa) and
|
|
|
|
/// suggest using the variable directly.
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Unnecessary code.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2019-08-02 06:13:54 +00:00
|
|
|
/// ```rust,ignore
|
2020-03-18 01:50:39 +00:00
|
|
|
/// if x == true {}
|
|
|
|
/// if y == false {}
|
|
|
|
/// ```
|
|
|
|
/// use `x` directly:
|
|
|
|
/// ```rust,ignore
|
|
|
|
/// if x {}
|
|
|
|
/// if !y {}
|
2019-03-05 16:50:33 +00:00
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 19:06:26 +00:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2016-02-09 19:10:22 +00:00
|
|
|
pub BOOL_COMPARISON,
|
2018-03-29 11:41:53 +00:00
|
|
|
complexity,
|
2019-01-31 01:15:29 +00:00
|
|
|
"comparing a variable to a boolean, e.g., `if x == true` or `if x != true`"
|
2016-02-09 19:10:22 +00:00
|
|
|
}
|
|
|
|
|
2019-04-08 20:43:55 +00:00
|
|
|
declare_lint_pass!(NeedlessBool => [NEEDLESS_BOOL]);
|
2015-08-11 18:22:20 +00:00
|
|
|
|
2021-12-02 21:47:57 +00: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 20:41:36 +00:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for NeedlessBool {
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
|
2020-02-21 08:39:38 +00:00
|
|
|
use self::Expression::{Bool, RetBool};
|
2021-07-15 08:44:10 +00:00
|
|
|
if e.span.from_expansion() {
|
|
|
|
return;
|
|
|
|
}
|
2021-08-08 14:49:13 +00:00
|
|
|
if let Some(higher::If {
|
|
|
|
cond,
|
|
|
|
then,
|
|
|
|
r#else: Some(r#else),
|
|
|
|
}) = higher::If::hir(e)
|
|
|
|
{
|
2016-07-03 23:17:31 +00:00
|
|
|
let reduce = |ret, not| {
|
2018-11-27 14:13:57 +00:00
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
2021-08-08 14:49:13 +00:00
|
|
|
let snip = Sugg::hir_with_applicability(cx, cond, "<predicate>", &mut applicability);
|
2019-01-22 11:33:47 +00:00
|
|
|
let mut snip = if not { !snip } else { snip };
|
2016-07-03 23:17:31 +00:00
|
|
|
|
2019-01-22 11:33:47 +00:00
|
|
|
if ret {
|
|
|
|
snip = snip.make_return();
|
|
|
|
}
|
2016-07-03 23:17:31 +00:00
|
|
|
|
2021-04-22 09:31:13 +00:00
|
|
|
if is_else_clause(cx.tcx, e) {
|
2021-06-03 06:41:37 +00:00
|
|
|
snip = snip.blockify();
|
2019-01-20 15:15:00 +00:00
|
|
|
}
|
|
|
|
|
2021-12-02 21:47:57 +00:00
|
|
|
if condition_needs_parentheses(cond) && is_parent_stmt(cx, e.hir_id) {
|
|
|
|
snip = snip.maybe_par();
|
|
|
|
}
|
|
|
|
|
2017-08-09 07:30:56 +00: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 11:33:47 +00:00
|
|
|
snip.to_string(),
|
2018-11-27 14:13:57 +00:00
|
|
|
applicability,
|
2017-08-09 07:30:56 +00:00
|
|
|
);
|
2016-03-14 15:41:41 +00:00
|
|
|
};
|
2021-08-08 14:49:13 +00:00
|
|
|
if let ExprKind::Block(then, _) = then.kind {
|
|
|
|
match (fetch_bool_block(then), fetch_bool_expr(r#else)) {
|
2017-09-05 09:33:04 +00:00
|
|
|
(RetBool(true), RetBool(true)) | (Bool(true), Bool(true)) => {
|
2017-08-09 07:30:56 +00:00
|
|
|
span_lint(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_BOOL,
|
|
|
|
e.span,
|
|
|
|
"this if-then-else expression will always return true",
|
|
|
|
);
|
2017-04-12 09:06:32 +00:00
|
|
|
},
|
2017-09-05 09:33:04 +00:00
|
|
|
(RetBool(false), RetBool(false)) | (Bool(false), Bool(false)) => {
|
2017-08-09 07:30:56 +00:00
|
|
|
span_lint(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_BOOL,
|
|
|
|
e.span,
|
|
|
|
"this if-then-else expression will always return false",
|
|
|
|
);
|
2017-04-12 09:06:32 +00: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 21:46:08 +00:00
|
|
|
} else {
|
2020-01-06 06:30:43 +00:00
|
|
|
panic!("IfExpr `then` node is not an `ExprKind::Block`");
|
2017-03-31 21:46:08 +00:00
|
|
|
}
|
2015-08-11 18:22:20 +00:00
|
|
|
}
|
2015-05-01 22:35:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-08 20:43:55 +00:00
|
|
|
declare_lint_pass!(BoolComparison => [BOOL_COMPARISON]);
|
2016-02-09 19:10:22 +00:00
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for BoolComparison {
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
|
2019-08-19 16:30:32 +00:00
|
|
|
if e.span.from_expansion() {
|
2018-10-29 21:23:45 +00:00
|
|
|
return;
|
|
|
|
}
|
2018-11-02 11:12:14 +00:00
|
|
|
|
2019-09-27 15:16:06 +00:00
|
|
|
if let ExprKind::Binary(Spanned { node, .. }, ..) = e.kind {
|
2018-12-07 00:50:16 +00:00
|
|
|
let ignore_case = None::<(fn(_) -> _, &str)>;
|
|
|
|
let ignore_no_literal = None::<(fn(_, _) -> _, &str)>;
|
2018-11-30 13:21:11 +00:00
|
|
|
match node {
|
2018-12-07 00:50:16 +00:00
|
|
|
BinOpKind::Eq => {
|
|
|
|
let true_case = Some((|h| h, "equality checks against true are unnecessary"));
|
|
|
|
let false_case = Some((
|
|
|
|
|h: Sugg<'_>| !h,
|
|
|
|
"equality checks against false can be replaced by a negation",
|
|
|
|
));
|
2021-06-03 06:41:37 +00:00
|
|
|
check_comparison(cx, e, true_case, false_case, true_case, false_case, ignore_no_literal);
|
2018-12-07 00:50:16 +00:00
|
|
|
},
|
|
|
|
BinOpKind::Ne => {
|
|
|
|
let true_case = Some((
|
|
|
|
|h: Sugg<'_>| !h,
|
|
|
|
"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 06:41:37 +00:00
|
|
|
check_comparison(cx, e, true_case, false_case, true_case, false_case, ignore_no_literal);
|
2018-12-07 00:50:16 +00:00
|
|
|
},
|
|
|
|
BinOpKind::Lt => check_comparison(
|
2018-11-30 13:21:11 +00:00
|
|
|
cx,
|
|
|
|
e,
|
2018-12-07 00:50:16 +00:00
|
|
|
ignore_case,
|
|
|
|
Some((|h| h, "greater than checks against false are unnecessary")),
|
|
|
|
Some((
|
|
|
|
|h: Sugg<'_>| !h,
|
|
|
|
"less than comparison against true can be replaced by a negation",
|
|
|
|
)),
|
|
|
|
ignore_case,
|
|
|
|
Some((
|
2018-12-17 18:32:24 +00:00
|
|
|
|l: Sugg<'_>, r: Sugg<'_>| (!l).bit_and(&r),
|
2018-12-07 00:50:16 +00:00
|
|
|
"order comparisons between booleans can be simplified",
|
|
|
|
)),
|
2018-11-30 13:21:11 +00:00
|
|
|
),
|
2018-12-07 00:50:16 +00:00
|
|
|
BinOpKind::Gt => check_comparison(
|
2018-11-30 13:21:11 +00:00
|
|
|
cx,
|
|
|
|
e,
|
2018-12-07 00:50:16 +00:00
|
|
|
Some((
|
|
|
|
|h: Sugg<'_>| !h,
|
|
|
|
"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((
|
2018-12-17 18:32:24 +00:00
|
|
|
|l: Sugg<'_>, r: Sugg<'_>| l.bit_and(&(!r)),
|
2018-12-07 00:50:16 +00:00
|
|
|
"order comparisons between booleans can be simplified",
|
|
|
|
)),
|
2018-11-30 13:21:11 +00:00
|
|
|
),
|
2018-10-29 21:23:45 +00:00
|
|
|
_ => (),
|
2016-02-09 19:10:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-23 20:21:18 +00: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 08:15:53 +00:00
|
|
|
if let ExprKind::Unary(UnOp::Not, operand) = e.kind {
|
2020-12-06 14:01:03 +00:00
|
|
|
return (true, operand.span);
|
|
|
|
}
|
2020-03-23 20:00:02 +00:00
|
|
|
(false, e.span)
|
2020-03-23 19:29:12 +00:00
|
|
|
}
|
|
|
|
|
2020-03-23 20:21:18 +00:00
|
|
|
fn one_side_is_unary_not<'tcx>(left_side: &'tcx Expr<'_>, right_side: &'tcx Expr<'_>) -> ExpressionInfoWithSpan {
|
2020-03-23 20:00:02 +00:00
|
|
|
let left = is_unary_not(left_side);
|
|
|
|
let right = is_unary_not(right_side);
|
|
|
|
|
2020-03-23 20:21:18 +00:00
|
|
|
ExpressionInfoWithSpan {
|
2020-03-30 19:19:30 +00:00
|
|
|
one_side_is_unary_not: left.0 != right.0,
|
2020-03-23 20:21:18 +00:00
|
|
|
left_span: left.1,
|
|
|
|
right_span: right.1,
|
|
|
|
}
|
2020-03-23 19:29:12 +00:00
|
|
|
}
|
|
|
|
|
2018-11-30 13:21:11 +00:00
|
|
|
fn check_comparison<'a, 'tcx>(
|
2020-06-25 20:41:36 +00:00
|
|
|
cx: &LateContext<'tcx>,
|
2019-12-27 07:12:26 +00:00
|
|
|
e: &'tcx Expr<'_>,
|
2018-12-07 00:50:16 +00: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 13:21:11 +00:00
|
|
|
) {
|
2020-02-21 08:39:38 +00:00
|
|
|
use self::Expression::{Bool, Other};
|
2018-11-30 13:21:11 +00:00
|
|
|
|
2021-04-08 15:50:13 +00:00
|
|
|
if let ExprKind::Binary(op, left_side, right_side) = e.kind {
|
2020-07-17 08:47:04 +00:00
|
|
|
let (l_ty, r_ty) = (
|
|
|
|
cx.typeck_results().expr_ty(left_side),
|
|
|
|
cx.typeck_results().expr_ty(right_side),
|
|
|
|
);
|
2020-10-28 22:36:07 +00:00
|
|
|
if is_expn_of(left_side.span, "cfg").is_some() || is_expn_of(right_side.span, "cfg").is_some() {
|
|
|
|
return;
|
|
|
|
}
|
2019-02-25 20:48:20 +00:00
|
|
|
if l_ty.is_bool() && r_ty.is_bool() {
|
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
2020-03-23 20:00:02 +00:00
|
|
|
|
2021-10-04 06:33:40 +00:00
|
|
|
if op.node == BinOpKind::Eq {
|
2021-04-08 15:50:13 +00:00
|
|
|
let expression_info = one_side_is_unary_not(left_side, right_side);
|
2020-03-23 20:21:18 +00:00
|
|
|
if expression_info.one_side_is_unary_not {
|
2020-03-23 20:00:02 +00:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
BOOL_COMPARISON,
|
|
|
|
e.span,
|
2020-08-11 13:43:21 +00:00
|
|
|
"this comparison might be written more concisely",
|
2020-03-23 20:00:02 +00:00
|
|
|
"try simplifying it as shown",
|
2020-03-23 20:21:18 +00: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 20:00:02 +00:00
|
|
|
applicability,
|
2021-06-03 06:41:37 +00:00
|
|
|
);
|
2020-03-23 20:00:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-25 20:48:20 +00:00
|
|
|
match (fetch_bool_expr(left_side), fetch_bool_expr(right_side)) {
|
|
|
|
(Bool(true), Other) => left_true.map_or((), |(h, m)| {
|
2021-06-03 06:41:37 +00:00
|
|
|
suggest_bool_comparison(cx, e, right_side, applicability, m, h);
|
2019-02-25 20:48:20 +00:00
|
|
|
}),
|
|
|
|
(Other, Bool(true)) => right_true.map_or((), |(h, m)| {
|
2021-06-03 06:41:37 +00:00
|
|
|
suggest_bool_comparison(cx, e, left_side, applicability, m, h);
|
2019-02-25 20:48:20 +00:00
|
|
|
}),
|
|
|
|
(Bool(false), Other) => left_false.map_or((), |(h, m)| {
|
2021-06-03 06:41:37 +00:00
|
|
|
suggest_bool_comparison(cx, e, right_side, applicability, m, h);
|
2019-02-25 20:48:20 +00:00
|
|
|
}),
|
|
|
|
(Other, Bool(false)) => right_false.map_or((), |(h, m)| {
|
2021-06-03 06:41:37 +00:00
|
|
|
suggest_bool_comparison(cx, e, left_side, applicability, m, h);
|
2019-02-25 20:48:20 +00:00
|
|
|
}),
|
|
|
|
(Other, Other) => no_literal.map_or((), |(h, m)| {
|
2018-12-07 00:50:16 +00: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 06:41:37 +00:00
|
|
|
);
|
2019-02-25 20:48:20 +00:00
|
|
|
}),
|
|
|
|
_ => (),
|
|
|
|
}
|
2018-11-30 13:21:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn suggest_bool_comparison<'a, 'tcx>(
|
2020-06-25 20:41:36 +00:00
|
|
|
cx: &LateContext<'tcx>,
|
2019-12-27 07:12:26 +00:00
|
|
|
e: &'tcx Expr<'_>,
|
|
|
|
expr: &Expr<'_>,
|
2018-11-30 13:21:11 +00:00
|
|
|
mut applicability: Applicability,
|
|
|
|
message: &str,
|
2018-12-07 00:50:16 +00:00
|
|
|
conv_hint: impl FnOnce(Sugg<'a>) -> Sugg<'a>,
|
2018-11-30 13:21:11 +00:00
|
|
|
) {
|
2020-10-28 22:36:07 +00:00
|
|
|
let hint = if expr.span.from_expansion() {
|
|
|
|
if applicability != Applicability::Unspecified {
|
|
|
|
applicability = Applicability::MaybeIncorrect;
|
|
|
|
}
|
|
|
|
Sugg::hir_with_macro_callsite(cx, expr, "..")
|
|
|
|
} else {
|
|
|
|
Sugg::hir_with_applicability(cx, expr, "..", &mut applicability)
|
|
|
|
};
|
2018-11-30 13:21:11 +00:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
BOOL_COMPARISON,
|
|
|
|
e.span,
|
|
|
|
message,
|
|
|
|
"try simplifying it as shown",
|
|
|
|
conv_hint(hint).to_string(),
|
|
|
|
applicability,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2016-03-14 15:41:41 +00:00
|
|
|
enum Expression {
|
|
|
|
Bool(bool),
|
|
|
|
RetBool(bool),
|
|
|
|
Other,
|
|
|
|
}
|
|
|
|
|
2019-12-27 07:12:26 +00:00
|
|
|
fn fetch_bool_block(block: &Block<'_>) -> Expression {
|
2016-03-14 15:41:41 +00:00
|
|
|
match (&*block.stmts, block.expr.as_ref()) {
|
2016-06-10 17:47:10 +00:00
|
|
|
(&[], Some(e)) => fetch_bool_expr(&**e),
|
2018-11-27 20:14:15 +00:00
|
|
|
(&[ref e], None) => {
|
2021-04-08 15:50:13 +00:00
|
|
|
if let StmtKind::Semi(e) = e.kind {
|
2019-09-27 15:16:06 +00:00
|
|
|
if let ExprKind::Ret(_) = e.kind {
|
2021-04-08 15:50:13 +00:00
|
|
|
fetch_bool_expr(e)
|
2018-11-27 20:14:15 +00:00
|
|
|
} else {
|
|
|
|
Expression::Other
|
|
|
|
}
|
2016-03-14 15:41:41 +00:00
|
|
|
} else {
|
|
|
|
Expression::Other
|
|
|
|
}
|
2016-12-20 17:21:30 +00:00
|
|
|
},
|
2016-03-14 15:41:41 +00:00
|
|
|
_ => Expression::Other,
|
2016-01-04 04:26:12 +00:00
|
|
|
}
|
2015-05-01 22:35:49 +00:00
|
|
|
}
|
2015-08-11 18:22:20 +00:00
|
|
|
|
2019-12-27 07:12:26 +00:00
|
|
|
fn fetch_bool_expr(expr: &Expr<'_>) -> Expression {
|
2019-09-27 15:16:06 +00:00
|
|
|
match expr.kind {
|
2021-04-08 15:50:13 +00:00
|
|
|
ExprKind::Block(block, _) => fetch_bool_block(block),
|
2018-11-27 20:14:15 +00:00
|
|
|
ExprKind::Lit(ref lit_ptr) => {
|
|
|
|
if let LitKind::Bool(value) = lit_ptr.node {
|
|
|
|
Expression::Bool(value)
|
|
|
|
} else {
|
|
|
|
Expression::Other
|
|
|
|
}
|
2016-12-20 17:21:30 +00:00
|
|
|
},
|
2021-04-08 15:50:13 +00:00
|
|
|
ExprKind::Ret(Some(expr)) => match fetch_bool_expr(expr) {
|
2017-09-05 09:33:04 +00:00
|
|
|
Expression::Bool(value) => Expression::RetBool(value),
|
|
|
|
_ => Expression::Other,
|
2016-12-20 17:21:30 +00:00
|
|
|
},
|
2016-03-14 15:41:41 +00:00
|
|
|
_ => Expression::Other,
|
2015-08-11 18:22:20 +00:00
|
|
|
}
|
2015-05-01 22:35:49 +00:00
|
|
|
}
|