use if_chain::if_chain;
use rustc_errors::Applicability;
use rustc_hir::intravisit::{walk_expr, Visitor};
-use rustc_hir::{BlockCheckMode, Expr, ExprKind};
+use rustc_hir::{BlockCheckMode, Closure, Expr, ExprKind};
use rustc_lint::{LateContext, LateLintPass, LintContext};
use rustc_middle::lint::in_external_macro;
use rustc_session::{declare_lint_pass, declare_tool_lint};
///
/// ### Examples
/// ```rust
- /// // Bad
+ /// # fn somefunc() -> bool { true };
/// if { true } { /* ... */ }
///
- /// // Good
- /// if true { /* ... */ }
+ /// if { let x = somefunc(); x } { /* ... */ }
/// ```
///
- /// // or
- ///
+ /// Use instead:
/// ```rust
/// # fn somefunc() -> bool { true };
- /// // Bad
- /// if { let x = somefunc(); x } { /* ... */ }
+ /// if true { /* ... */ }
///
- /// // Good
/// let res = { let x = somefunc(); x };
/// if res { /* ... */ }
/// ```
impl<'a, 'tcx> Visitor<'tcx> for ExVisitor<'a, 'tcx> {
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
- if let ExprKind::Closure(_, _, eid, _, _) = expr.kind {
+ if let ExprKind::Closure(&Closure { body, .. }) = expr.kind {
// do not lint if the closure is called using an iterator (see #1141)
if_chain! {
if let Some(parent) = get_parent_expr(self.cx, expr);
}
}
- let body = self.cx.tcx.hir().body(eid);
+ let body = self.cx.tcx.hir().body(body);
let ex = &body.value;
if let ExprKind::Block(block, _) = ex.kind {
if !body.value.span.from_expansion() && !block.stmts.is_empty() {