mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make block_in_if_condition auto applicable

Browse Source
This commit is contained in:
flip1995 2020-02-04 16:08:15 +01:00
parent 5fd22b3f93
commit 19f08c200e
No known key found for this signature in database
GPG Key ID: 693086869D506637
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
clippy_lints/src/block_in_if_condition.rs
View File

@ -2,6 +2,7 @@
use matches::matches; use matches::matches;
use rustc::hir::map::Map; use rustc::hir::map::Map;
use rustc::lint::in_external_macro; use rustc::lint::in_external_macro;
use rustc_errors::Applicability;
use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
use rustc_hir::*; use rustc_hir::*;
use rustc_lint::{LateContext, LateLintPass, LintContext}; use rustc_lint::{LateContext, LateLintPass, LintContext};
@ -79,8 +80,8 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr<'_>) {
if in_external_macro(cx.sess(), expr.span) { if in_external_macro(cx.sess(), expr.span) {
return; return;
} }
if let Some((check, then, _)) = higher::if_block(&expr) { if let Some((cond, _, _)) = higher::if_block(&expr) {
if let ExprKind::Block(block, _) = &check.kind { if let ExprKind::Block(block, _) = &cond.kind {
if block.rules == BlockCheckMode::DefaultBlock { if block.rules == BlockCheckMode::DefaultBlock {
if block.stmts.is_empty() { if block.stmts.is_empty() {
if let Some(ex) = &block.expr { if let Some(ex) = &block.expr {
@ -89,16 +90,24 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr<'_>) {
if expr.span.from_expansion() || differing_macro_contexts(expr.span, ex.span) { if expr.span.from_expansion() || differing_macro_contexts(expr.span, ex.span) {
return; return;
} }
span_lint_and_help( let mut applicability = Applicability::MachineApplicable;
span_lint_and_sugg(
cx, cx,
BLOCK_IN_IF_CONDITION_EXPR, BLOCK_IN_IF_CONDITION_EXPR,
check.span, cond.span,
BRACED_EXPR_MESSAGE, BRACED_EXPR_MESSAGE,
&format!( "try",
"try\nif {} {} ... ", format!(
snippet_block(cx, ex.span, ".."), "{}",
snippet_block(cx, then.span, "..") snippet_block_with_applicability(
cx,
ex.span,
"..",
Some(expr.span),
&mut applicability
)
), ),
applicability,
); );
} }
} else { } else {
@ -107,22 +116,30 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr<'_>) {
return; return;
} }
// move block higher // move block higher
span_lint_and_help( let mut applicability = Applicability::MachineApplicable;
span_lint_and_sugg(
cx, cx,
BLOCK_IN_IF_CONDITION_STMT, BLOCK_IN_IF_CONDITION_STMT,
check.span, expr.span.with_hi(cond.span.hi()),
COMPLEX_BLOCK_MESSAGE, COMPLEX_BLOCK_MESSAGE,
&format!( "try",
"try\nlet res = {};\nif res {} ... ", format!(
snippet_block(cx, block.span, ".."), "let res = {}; if res",
snippet_block(cx, then.span, "..") snippet_block_with_applicability(
cx,
block.span,
"..",
Some(expr.span),
&mut applicability
),
), ),
applicability,
); );
} }
} }
} else { } else {
let mut visitor = ExVisitor { found_block: None, cx }; let mut visitor = ExVisitor { found_block: None, cx };
walk_expr(&mut visitor, check); walk_expr(&mut visitor, cond);
if let Some(block) = visitor.found_block { if let Some(block) = visitor.found_block {
span_lint(cx, BLOCK_IN_IF_CONDITION_STMT, block.span, COMPLEX_BLOCK_MESSAGE); span_lint(cx, BLOCK_IN_IF_CONDITION_STMT, block.span, COMPLEX_BLOCK_MESSAGE);
} }