-use crate::utils::*;
+use crate::utils::{differing_macro_contexts, higher, snippet_block_with_applicability, span_lint, span_lint_and_sugg};
use matches::matches;
-use rustc::declare_lint_pass;
use rustc::hir::map::Map;
-use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
+use rustc::lint::in_external_macro;
+use rustc_errors::Applicability;
use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
-use rustc_hir::*;
-use rustc_session::declare_tool_lint;
+use rustc_hir::{BlockCheckMode, Expr, ExprKind};
+use rustc_lint::{LateContext, LateLintPass, LintContext};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
declare_clippy_lint! {
/// **What it does:** Checks for `if` conditions that use blocks to contain an
}
walk_expr(self, expr);
}
- fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
+ fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
NestedVisitorMap::None
}
}
if in_external_macro(cx.sess(), expr.span) {
return;
}
- if let Some((check, then, _)) = higher::if_block(&expr) {
- if let ExprKind::Block(block, _) = &check.kind {
+ if let Some((cond, _, _)) = higher::if_block(&expr) {
+ if let ExprKind::Block(block, _) = &cond.kind {
if block.rules == BlockCheckMode::DefaultBlock {
if block.stmts.is_empty() {
if let Some(ex) = &block.expr {
if expr.span.from_expansion() || differing_macro_contexts(expr.span, ex.span) {
return;
}
- span_help_and_lint(
+ let mut applicability = Applicability::MachineApplicable;
+ span_lint_and_sugg(
cx,
BLOCK_IN_IF_CONDITION_EXPR,
- check.span,
+ cond.span,
BRACED_EXPR_MESSAGE,
- &format!(
- "try\nif {} {} ... ",
- snippet_block(cx, ex.span, ".."),
- snippet_block(cx, then.span, "..")
+ "try",
+ format!(
+ "{}",
+ snippet_block_with_applicability(
+ cx,
+ ex.span,
+ "..",
+ Some(expr.span),
+ &mut applicability
+ )
),
+ applicability,
);
}
} else {
return;
}
// move block higher
- span_help_and_lint(
+ let mut applicability = Applicability::MachineApplicable;
+ span_lint_and_sugg(
cx,
BLOCK_IN_IF_CONDITION_STMT,
- check.span,
+ expr.span.with_hi(cond.span.hi()),
COMPLEX_BLOCK_MESSAGE,
- &format!(
- "try\nlet res = {};\nif res {} ... ",
- snippet_block(cx, block.span, ".."),
- snippet_block(cx, then.span, "..")
+ "try",
+ format!(
+ "let res = {}; if res",
+ snippet_block_with_applicability(
+ cx,
+ block.span,
+ "..",
+ Some(expr.span),
+ &mut applicability
+ ),
),
+ applicability,
);
}
}
} else {
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 {
span_lint(cx, BLOCK_IN_IF_CONDITION_STMT, block.span, COMPLEX_BLOCK_MESSAGE);
}