-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-use matches::matches;
-use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use crate::rustc::{declare_tool_lint, lint_array};
-use crate::rustc::hir::*;
-use crate::rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
use crate::utils::*;
+use matches::matches;
+use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
+use rustc::hir::*;
+use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
+use rustc::{declare_lint_pass, declare_tool_lint};
-/// **What it does:** Checks for `if` conditions that use blocks to contain an
-/// expression.
-///
-/// **Why is this bad?** It isn't really Rust style, same as using parentheses
-/// to contain expressions.
-///
-/// **Known problems:** None.
-///
-/// **Example:**
-/// ```rust
-/// if { true } ..
-/// ```
declare_clippy_lint! {
+ /// **What it does:** Checks for `if` conditions that use blocks to contain an
+ /// expression.
+ ///
+ /// **Why is this bad?** It isn't really Rust style, same as using parentheses
+ /// to contain expressions.
+ ///
+ /// **Known problems:** None.
+ ///
+ /// **Example:**
+ /// ```rust
+ /// if { true } { /* ... */ }
+ /// ```
pub BLOCK_IN_IF_CONDITION_EXPR,
style,
- "braces that can be eliminated in conditions, e.g. `if { true } ...`"
+ "braces that can be eliminated in conditions, e.g., `if { true } ...`"
}
-/// **What it does:** Checks for `if` conditions that use blocks containing
-/// statements, or conditions that use closures with blocks.
-///
-/// **Why is this bad?** Using blocks in the condition makes it hard to read.
-///
-/// **Known problems:** None.
-///
-/// **Example:**
-/// ```rust
-/// if { let x = somefunc(); x } ..
-/// // or
-/// if somefunc(|x| { x == 47 }) ..
-/// ```
declare_clippy_lint! {
+ /// **What it does:** Checks for `if` conditions that use blocks containing
+ /// statements, or conditions that use closures with blocks.
+ ///
+ /// **Why is this bad?** Using blocks in the condition makes it hard to read.
+ ///
+ /// **Known problems:** None.
+ ///
+ /// **Example:**
+ /// ```ignore
+ /// if { let x = somefunc(); x } {}
+ /// // or
+ /// if somefunc(|x| { x == 47 }) {}
+ /// ```
pub BLOCK_IN_IF_CONDITION_STMT,
style,
- "complex blocks in conditions, e.g. `if { let x = true; x } ...`"
+ "complex blocks in conditions, e.g., `if { let x = true; x } ...`"
}
-#[derive(Copy, Clone)]
-pub struct BlockInIfCondition;
+declare_lint_pass!(BlockInIfCondition => [BLOCK_IN_IF_CONDITION_EXPR, BLOCK_IN_IF_CONDITION_STMT]);
-impl LintPass for BlockInIfCondition {
- fn get_lints(&self) -> LintArray {
- lint_array!(BLOCK_IN_IF_CONDITION_EXPR, BLOCK_IN_IF_CONDITION_STMT)
- }
-}
-
-struct ExVisitor<'a, 'tcx: 'a> {
+struct ExVisitor<'a, 'tcx> {
found_block: Option<&'tcx Expr>,
cx: &'a LateContext<'a, 'tcx>,
}
-impl<'a, 'tcx: 'a> Visitor<'tcx> for ExVisitor<'a, 'tcx> {
+impl<'a, 'tcx> Visitor<'tcx> for ExVisitor<'a, 'tcx> {
fn visit_expr(&mut self, expr: &'tcx Expr) {
if let ExprKind::Closure(_, _, eid, _, _) = expr.node {
- let body = self.cx.tcx.hir.body(eid);
+ let body = self.cx.tcx.hir().body(eid);
let ex = &body.value;
- if matches!(ex.node, ExprKind::Block(_, _)) {
+ if matches!(ex.node, ExprKind::Block(_, _)) && !body.value.span.from_expansion() {
self.found_block = Some(ex);
return;
}
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for BlockInIfCondition {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
- if let ExprKind::If(ref check, ref then, _) = expr.node {
- if let ExprKind::Block(ref block, _) = check.node {
+ if in_external_macro(cx.sess(), expr.span) {
+ return;
+ }
+ if let Some((check, then, _)) = higher::if_block(&expr) {
+ if let ExprKind::Block(block, _) = &check.node {
if block.rules == DefaultBlock {
if block.stmts.is_empty() {
- if let Some(ref ex) = block.expr {
+ if let Some(ex) = &block.expr {
// don't dig into the expression here, just suggest that they remove
// the block
- if in_macro(expr.span) || differing_macro_contexts(expr.span, ex.span) {
+ if expr.span.from_expansion() || differing_macro_contexts(expr.span, ex.span) {
return;
}
span_help_and_lint(
);
}
} else {
- let span = block
- .expr
- .as_ref()
- .map_or_else(|| block.stmts[0].span, |e| e.span);
- if in_macro(span) || differing_macro_contexts(expr.span, span) {
+ let span = block.expr.as_ref().map_or_else(|| block.stmts[0].span, |e| e.span);
+ if span.from_expansion() || differing_macro_contexts(expr.span, span) {
return;
}
// move block higher
}
}
} else {
- let mut visitor = ExVisitor {
- found_block: None,
- cx,
- };
+ let mut visitor = ExVisitor { found_block: None, cx };
walk_expr(&mut visitor, check);
if let Some(block) = visitor.found_block {
span_lint(cx, BLOCK_IN_IF_CONDITION_STMT, block.span, COMPLEX_BLOCK_MESSAGE);