Skip to content

Commit 7b3af41

Browse files
borsbors
committed
Auto merge of rust-lang#79328 - c410-f3r:hir-if, r=matthewjasper
Reintroduce hir::ExprKind::If Basically copied and paste rust-lang#59288/rust-lang/rust-clippy#4080 with some modifications. The vast majority of tests were fixed and now there are only a few remaining. Since I am still unable to figure out the missing pieces, any help with the following list is welcome. - [ ] **Unnecessary `typeck` exception**: [Cheated on this one to make CI green.](https://github.com/rust-lang/rust/pull/79328/files#diff-3faee9ba23fc54a12b7c43364ba81f8c5660045c7e1d7989a02a0cee1c5b2051) - [x] **Incorrect span**: [Span should reference `then` and `else` separately.](https://github.com/rust-lang/rust/pull/79328/files#diff-cf2c46e82222ee4b1037a68fff8a1af3c4f1de7a6b3fd798aacbf3c0475abe3d) - [x] **New note regarding `assert!`**: [Modified but not "wrong". Maybe can be a good thing?](https://github.com/rust-lang/rust/pull/79328/files#diff-9e0d7c89ed0224e2b62060c957177c27db43c30dfe3c2974cb6b5091cda9cfb5) - [x] **Inverted report location**: [Modified but not "wrong". Locations were inverted.](https://github.com/rust-lang/rust/pull/79328/files#diff-f637ce7c1f68d523a165aa9651765df05e36c4d7d279194b1a6b28b48a323691) - [x] **`src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs` has weird errors**: [Not sure why this is happening.](https://github.com/rust-lang/rust/pull/79328/files#diff-c823c09660f5b112f95e97e8ff71f1797b6c7f37dbb3d16f8e98bbaea8072e95) - [x] **Missing diagnostic**: [???](https://github.com/rust-lang/rust/pull/79328/files#diff-6b8ab09360d725ba4513933827f9796b42ff9522b0690f80b76de067143af2fc)
2 parents dcd8c8e + 7d42172 commit 7b3af41

31 files changed

+152
-131
lines changed

‎clippy_lints/src/assertions_on_constants.rs

+10-20
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use crate::consts::{constant, Constant};
22
use crate::utils::{is_direct_expn_of, is_expn_of, match_panic_call, snippet_opt, span_lint_and_help};
33
use if_chain::if_chain;
4-
use rustc_ast::ast::LitKind;
5-
use rustc_hir::{Expr, ExprKind, PatKind, UnOp};
4+
use rustc_hir::{Expr, ExprKind, UnOp};
65
use rustc_lint::{LateContext, LateLintPass};
76
use rustc_session::{declare_lint_pass, declare_tool_lint};
87

@@ -102,31 +101,22 @@ enum AssertKind {
102101
/// Check if the expression matches
103102
///
104103
/// ```rust,ignore
105-
/// match { let _t = !c; _t } {
106-
/// true => {
107-
/// {
108-
/// ::std::rt::begin_panic(message, _)
109-
/// }
110-
/// }
111-
/// _ => { }
112-
/// };
104+
/// if !c {
105+
/// {
106+
/// ::std::rt::begin_panic(message, _)
107+
/// }
108+
/// }
113109
/// ```
114110
///
115111
/// where `message` is any expression and `c` is a constant bool.
116112
fn match_assert_with_message<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Option<AssertKind> {
117113
if_chain! {
118-
if let ExprKind::Match(ref expr, ref arms, _) = expr.kind;
119-
// matches { let _t = expr; _t }
120-
if let ExprKind::DropTemps(ref expr) = expr.kind;
121-
if let ExprKind::Unary(UnOp::UnNot, ref expr) = expr.kind;
114+
if let ExprKind::If(ref cond, ref then, _) = expr.kind;
115+
if let ExprKind::Unary(UnOp::UnNot, ref expr) = cond.kind;
122116
// bind the first argument of the `assert!` macro
123117
if let Some((Constant::Bool(is_true), _)) = constant(cx, cx.typeck_results(), expr);
124-
// arm 1 pattern
125-
if let PatKind::Lit(ref lit_expr) = arms[0].pat.kind;
126-
if let ExprKind::Lit(ref lit) = lit_expr.kind;
127-
if let LitKind::Bool(true) = lit.node;
128-
// arm 1 block
129-
if let ExprKind::Block(ref block, _) = arms[0].body.kind;
118+
// block
119+
if let ExprKind::Block(ref block, _) = then.kind;
130120
if block.stmts.is_empty();
131121
if let Some(block_expr) = &block.expr;
132122
// inner block is optional. unwrap it if it exists, or use the expression as is otherwise.

‎clippy_lints/src/blocks_in_if_conditions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::utils::{differing_macro_contexts, higher, snippet_block_with_applicability, span_lint, span_lint_and_sugg};
1+
use crate::utils::{differing_macro_contexts, snippet_block_with_applicability, span_lint, span_lint_and_sugg};
22
use rustc_errors::Applicability;
33
use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
44
use rustc_hir::{BlockCheckMode, Expr, ExprKind};
@@ -75,7 +75,7 @@ impl<'tcx> LateLintPass<'tcx> for BlocksInIfConditions {
7575
if in_external_macro(cx.sess(), expr.span) {
7676
return;
7777
}
78-
if let Some((cond, _, _)) = higher::if_block(&expr) {
78+
if let ExprKind::If(cond, _, _) = &expr.kind {
7979
if let ExprKind::Block(block, _) = &cond.kind {
8080
if block.rules == BlockCheckMode::DefaultBlock {
8181
if block.stmts.is_empty() {

‎clippy_lints/src/cognitive_complexity.rs

+3
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ impl<'tcx> Visitor<'tcx> for CCHelper {
147147
fn visit_expr(&mut self, e: &'tcx Expr<'_>) {
148148
walk_expr(self, e);
149149
match e.kind {
150+
ExprKind::If(_, _, _) => {
151+
self.cc += 1;
152+
},
150153
ExprKind::Match(_, ref arms, _) => {
151154
if arms.len() > 1 {
152155
self.cc += 1;

‎clippy_lints/src/consts.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![allow(clippy::float_cmp)]
22

3-
use crate::utils::{clip, higher, sext, unsext};
3+
use crate::utils::{clip, sext, unsext};
44
use if_chain::if_chain;
55
use rustc_ast::ast::{FloatTy, LitFloatType, LitKind};
66
use rustc_data_structures::sync::Lrc;
@@ -228,9 +228,6 @@ pub struct ConstEvalLateContext<'a, 'tcx> {
228228
impl<'a, 'tcx> ConstEvalLateContext<'a, 'tcx> {
229229
/// Simple constant folding: Insert an expression, get a constant or none.
230230
pub fn expr(&mut self, e: &Expr<'_>) -> Option<Constant> {
231-
if let Some((ref cond, ref then, otherwise)) = higher::if_block(&e) {
232-
return self.ifthenelse(cond, then, otherwise);
233-
}
234231
match e.kind {
235232
ExprKind::Path(ref qpath) => self.fetch_path(qpath, e.hir_id, self.typeck_results.expr_ty(e)),
236233
ExprKind::Block(ref block, _) => self.block(block),
@@ -249,6 +246,7 @@ impl<'a, 'tcx> ConstEvalLateContext<'a, 'tcx> {
249246
UnOp::UnNeg => self.constant_negate(&o, self.typeck_results.expr_ty(e)),
250247
UnOp::UnDeref => Some(if let Constant::Ref(r) = o { *r } else { o }),
251248
}),
249+
ExprKind::If(ref cond, ref then, ref otherwise) => self.ifthenelse(cond, then, *otherwise),
252250
ExprKind::Binary(op, ref left, ref right) => self.binop(op, left, right),
253251
ExprKind::Call(ref callee, ref args) => {
254252
// We only handle a few const functions for now.

‎clippy_lints/src/copies.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::utils::{eq_expr_value, in_macro, search_same, SpanlessEq, SpanlessHash};
2-
use crate::utils::{get_parent_expr, higher, if_sequence, span_lint_and_note};
3-
use rustc_hir::{Block, Expr};
2+
use crate::utils::{get_parent_expr, if_sequence, span_lint_and_note};
3+
use rustc_hir::{Block, Expr, ExprKind};
44
use rustc_lint::{LateContext, LateLintPass};
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
66

@@ -109,11 +109,12 @@ impl<'tcx> LateLintPass<'tcx> for CopyAndPaste {
109109
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
110110
if !expr.span.from_expansion() {
111111
// skip ifs directly in else, it will be checked in the parent if
112-
if let Some(expr) = get_parent_expr(cx, expr) {
113-
if let Some((_, _, Some(ref else_expr))) = higher::if_block(&expr) {
114-
if else_expr.hir_id == expr.hir_id {
115-
return;
116-
}
112+
if let Some(&Expr {
113+
kind: ExprKind::If(_, _, Some(ref else_expr)),
114+
..
115+
}) = get_parent_expr(cx, expr) {
116+
if else_expr.hir_id == expr.hir_id {
117+
return;
117118
}
118119
}
119120

‎clippy_lints/src/entry.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::utils::SpanlessEq;
2-
use crate::utils::{get_item_name, higher, is_type_diagnostic_item, match_type, paths, snippet, snippet_opt};
2+
use crate::utils::{get_item_name, is_type_diagnostic_item, match_type, paths, snippet, snippet_opt};
33
use crate::utils::{snippet_with_applicability, span_lint_and_then};
44
use if_chain::if_chain;
55
use rustc_errors::Applicability;
@@ -54,7 +54,7 @@ declare_lint_pass!(HashMapPass => [MAP_ENTRY]);
5454

5555
impl<'tcx> LateLintPass<'tcx> for HashMapPass {
5656
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
57-
if let Some((ref check, ref then_block, ref else_block)) = higher::if_block(&expr) {
57+
if let ExprKind::If(ref check, ref then_block, ref else_block) = expr.kind {
5858
if let ExprKind::Unary(UnOp::UnNot, ref check) = check.kind {
5959
if let Some((ty, map, key)) = check_cond(cx, check) {
6060
// in case of `if !m.contains_key(&k) { m.insert(k, v); }`

‎clippy_lints/src/floating_point_arithmetic.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::consts::{
22
constant, constant_simple, Constant,
33
Constant::{Int, F32, F64},
44
};
5-
use crate::utils::{eq_expr_value, get_parent_expr, higher, numeric_literal, span_lint_and_sugg, sugg};
5+
use crate::utils::{eq_expr_value, get_parent_expr, numeric_literal, span_lint_and_sugg, sugg};
66
use if_chain::if_chain;
77
use rustc_errors::Applicability;
88
use rustc_hir::{BinOpKind, Expr, ExprKind, PathSegment, UnOp};
@@ -556,11 +556,11 @@ fn are_negated<'a>(cx: &LateContext<'_>, expr1: &'a Expr<'a>, expr2: &'a Expr<'a
556556

557557
fn check_custom_abs(cx: &LateContext<'_>, expr: &Expr<'_>) {
558558
if_chain! {
559-
if let Some((cond, body, Some(else_body))) = higher::if_block(&expr);
559+
if let ExprKind::If(cond, body, else_body) = expr.kind;
560560
if let ExprKind::Block(block, _) = body.kind;
561561
if block.stmts.is_empty();
562562
if let Some(if_body_expr) = block.expr;
563-
if let ExprKind::Block(else_block, _) = else_body.kind;
563+
if let Some(ExprKind::Block(else_block, _)) = else_body.map(|el| &el.kind);
564564
if else_block.stmts.is_empty();
565565
if let Some(else_body_expr) = else_block.expr;
566566
if let Some((if_expr_positive, body)) = are_negated(cx, if_body_expr, else_body_expr);

‎clippy_lints/src/implicit_return.rs

+7
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ fn expr_match(cx: &LateContext<'_>, expr: &Expr<'_>) {
8181
lint(cx, expr.span, break_expr.span, LINT_BREAK);
8282
}
8383
},
84+
ExprKind::If(.., if_expr, else_expr) => {
85+
expr_match(cx, if_expr);
86+
87+
if let Some(else_expr) = else_expr {
88+
expr_match(cx, else_expr);
89+
}
90+
},
8491
ExprKind::Match(.., arms, source) => {
8592
let check_all_arms = match source {
8693
MatchSource::IfLetDesugar {

‎clippy_lints/src/implicit_saturating_sub.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::utils::{higher, in_macro, match_qpath, span_lint_and_sugg, SpanlessEq};
1+
use crate::utils::{in_macro, match_qpath, span_lint_and_sugg, SpanlessEq};
22
use if_chain::if_chain;
33
use rustc_ast::ast::LitKind;
44
use rustc_errors::Applicability;
@@ -42,7 +42,7 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitSaturatingSub {
4242
return;
4343
}
4444
if_chain! {
45-
if let Some((ref cond, ref then, None)) = higher::if_block(&expr);
45+
if let ExprKind::If(cond, then, None) = &expr.kind;
4646

4747
// Check if the conditional expression is a binary operation
4848
if let ExprKind::Binary(ref cond_op, ref cond_left, ref cond_right) = cond.kind;

‎clippy_lints/src/let_if_seq.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use crate::utils::visitors::LocalUsedVisitor;
2-
use crate::utils::{higher, qpath_res, snippet, span_lint_and_then};
1+
use crate::utils::{qpath_res, snippet, span_lint_and_then, visitors::LocalUsedVisitor};
32
use if_chain::if_chain;
43
use rustc_errors::Applicability;
54
use rustc_hir as hir;
@@ -64,7 +63,7 @@ impl<'tcx> LateLintPass<'tcx> for LetIfSeq {
6463
if let hir::StmtKind::Local(ref local) = stmt.kind;
6564
if let hir::PatKind::Binding(mode, canonical_id, ident, None) = local.pat.kind;
6665
if let hir::StmtKind::Expr(ref if_) = expr.kind;
67-
if let Some((ref cond, ref then, ref else_)) = higher::if_block(&if_);
66+
if let hir::ExprKind::If(ref cond, ref then, ref else_) = if_.kind;
6867
if !LocalUsedVisitor::new(canonical_id).check_expr(cond);
6968
if let hir::ExprKind::Block(ref then, _) = then.kind;
7069
if let Some(value) = check_assign(cx, canonical_id, &*then);

‎clippy_lints/src/loops.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,14 @@ fn never_loop_expr(expr: &Expr<'_>, main_loop_id: HirId) -> NeverLoopResult {
742742
// Break can come from the inner loop so remove them.
743743
absorb_break(&never_loop_block(b, main_loop_id))
744744
},
745+
ExprKind::If(ref e, ref e2, ref e3) => {
746+
let e1 = never_loop_expr(e, main_loop_id);
747+
let e2 = never_loop_expr(e2, main_loop_id);
748+
let e3 = e3
749+
.as_ref()
750+
.map_or(NeverLoopResult::Otherwise, |e| never_loop_expr(e, main_loop_id));
751+
combine_seq(e1, combine_branches(e2, e3))
752+
},
745753
ExprKind::Match(ref e, ref arms, _) => {
746754
let e = never_loop_expr(e, main_loop_id);
747755
if arms.is_empty() {
@@ -2594,7 +2602,7 @@ fn is_loop(expr: &Expr<'_>) -> bool {
25942602
}
25952603

25962604
fn is_conditional(expr: &Expr<'_>) -> bool {
2597-
matches!(expr.kind, ExprKind::Match(..))
2605+
matches!(expr.kind, ExprKind::If(..) | ExprKind::Match(..))
25982606
}
25992607

26002608
fn is_nested(cx: &LateContext<'_>, match_expr: &Expr<'_>, iter_expr: &Expr<'_>) -> bool {

‎clippy_lints/src/manual_strip.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl<'tcx> LateLintPass<'tcx> for ManualStrip {
8080
}
8181

8282
if_chain! {
83-
if let Some((cond, then, _)) = higher::if_block(&expr);
83+
if let ExprKind::If(cond, then, _) = &expr.kind;
8484
if let ExprKind::MethodCall(_, _, [target_arg, pattern], _) = cond.kind;
8585
if let Some(method_def_id) = cx.typeck_results().type_dependent_def_id(cond.hir_id);
8686
if let ExprKind::Path(target_path) = &target_arg.kind;

‎clippy_lints/src/methods/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2048,6 +2048,7 @@ fn lint_expect_fun_call(
20482048
hir::ExprKind::Call(..)
20492049
| hir::ExprKind::MethodCall(..)
20502050
// These variants are debatable or require further examination
2051+
| hir::ExprKind::If(..)
20512052
| hir::ExprKind::Match(..)
20522053
| hir::ExprKind::Block{ .. } => true,
20532054
_ => false,

‎clippy_lints/src/methods/unnecessary_filter_map.rs

+6
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ fn check_expression<'tcx>(cx: &LateContext<'tcx>, arg_id: hir::HirId, expr: &'tc
9090
}
9191
(found_mapping, found_filtering)
9292
},
93+
// There must be an else_arm or there will be a type error
94+
hir::ExprKind::If(_, ref if_arm, Some(ref else_arm)) => {
95+
let if_check = check_expression(cx, arg_id, if_arm);
96+
let else_check = check_expression(cx, arg_id, else_arm);
97+
(if_check.0 | else_check.0, if_check.1 | else_check.1)
98+
},
9399
hir::ExprKind::Path(path) if match_qpath(path, &paths::OPTION_NONE) => (false, true),
94100
_ => (true, true),
95101
}

‎clippy_lints/src/mutable_debug_assertion.rs

+4
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ impl<'a, 'tcx> Visitor<'tcx> for MutArgVisitor<'a, 'tcx> {
9090
self.found = true;
9191
return;
9292
},
93+
ExprKind::If(..) => {
94+
self.found = true;
95+
return;
96+
},
9397
ExprKind::Path(_) => {
9498
if let Some(adj) = self.cx.typeck_results().adjustments().get(expr.hir_id) {
9599
if adj

‎clippy_lints/src/needless_bool.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
use crate::utils::sugg::Sugg;
66
use crate::utils::{
7-
higher, is_expn_of, parent_node_is_if_expr, snippet_with_applicability, span_lint, span_lint_and_sugg,
7+
is_expn_of, parent_node_is_if_expr, snippet_with_applicability, span_lint, span_lint_and_sugg,
88
};
99
use rustc_ast::ast::LitKind;
1010
use rustc_errors::Applicability;
@@ -71,7 +71,7 @@ declare_lint_pass!(NeedlessBool => [NEEDLESS_BOOL]);
7171
impl<'tcx> LateLintPass<'tcx> for NeedlessBool {
7272
fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
7373
use self::Expression::{Bool, RetBool};
74-
if let Some((ref pred, ref then_block, Some(ref else_expr))) = higher::if_block(&e) {
74+
if let ExprKind::If(ref pred, ref then_block, Some(ref else_expr)) = e.kind {
7575
let reduce = |ret, not| {
7676
let mut applicability = Applicability::MachineApplicable;
7777
let snip = Sugg::hir_with_applicability(cx, pred, "<predicate>", &mut applicability);

‎clippy_lints/src/option_if_let_else.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -109,25 +109,26 @@ fn extract_body_from_arm<'a>(arm: &'a Arm<'a>) -> Option<&'a Expr<'a>> {
109109
/// it in curly braces. Otherwise, we don't.
110110
fn should_wrap_in_braces(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
111111
utils::get_enclosing_block(cx, expr.hir_id).map_or(false, |parent| {
112+
let mut should_wrap = false;
113+
112114
if let Some(Expr {
113115
kind:
114116
ExprKind::Match(
115117
_,
116118
arms,
117-
MatchSource::IfDesugar {
118-
contains_else_clause: true,
119-
}
120-
| MatchSource::IfLetDesugar {
119+
MatchSource::IfLetDesugar {
121120
contains_else_clause: true,
122121
},
123122
),
124123
..
125124
}) = parent.expr
126125
{
127-
expr.hir_id == arms[1].body.hir_id
128-
} else {
129-
false
126+
should_wrap = expr.hir_id == arms[1].body.hir_id;
127+
} else if let Some(Expr { kind: ExprKind::If(_, _, Some(else_clause)), .. }) = parent.expr {
128+
should_wrap = expr.hir_id == else_clause.hir_id;
130129
}
130+
131+
should_wrap
131132
})
132133
}
133134

‎clippy_lints/src/question_mark.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_span::sym;
88

99
use crate::utils::sugg::Sugg;
1010
use crate::utils::{
11-
eq_expr_value, higher, is_type_diagnostic_item, match_def_path, match_qpath, paths, snippet_with_applicability,
11+
eq_expr_value, is_type_diagnostic_item, match_def_path, match_qpath, paths, snippet_with_applicability,
1212
span_lint_and_sugg,
1313
};
1414

@@ -50,7 +50,7 @@ impl QuestionMark {
5050
/// If it matches, it will suggest to use the question mark operator instead
5151
fn check_is_none_and_early_return_none(cx: &LateContext<'_>, expr: &Expr<'_>) {
5252
if_chain! {
53-
if let Some((if_expr, body, else_)) = higher::if_block(&expr);
53+
if let ExprKind::If(if_expr, body, else_) = &expr.kind;
5454
if let ExprKind::MethodCall(segment, _, args, _) = &if_expr.kind;
5555
if segment.ident.name == sym!(is_none);
5656
if Self::expression_returns_none(cx, body);

‎clippy_lints/src/returns.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,14 @@ fn check_final_expr<'tcx>(
184184
ExprKind::Block(ref block, _) => {
185185
check_block_return(cx, block);
186186
},
187+
ExprKind::If(_, then, else_clause_opt) => {
188+
if let ExprKind::Block(ref ifblock, _) = then.kind {
189+
check_block_return(cx, ifblock);
190+
}
191+
if let Some(else_clause) = else_clause_opt {
192+
check_final_expr(cx, else_clause, None, RetReplacement::Empty);
193+
}
194+
},
187195
// a match expr, check all arms
188196
// an if/if let expr, check both exprs
189197
// note, if without else is going to be a type checking error anyways
@@ -194,9 +202,6 @@ fn check_final_expr<'tcx>(
194202
check_final_expr(cx, &arm.body, Some(arm.body.span), RetReplacement::Block);
195203
}
196204
},
197-
MatchSource::IfDesugar {
198-
contains_else_clause: true,
199-
}
200205
| MatchSource::IfLetDesugar {
201206
contains_else_clause: true,
202207
} => {

‎clippy_lints/src/shadow.rs

+7
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,13 @@ fn check_expr<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, bindings: &mut
333333
check_expr(cx, e, bindings)
334334
}
335335
},
336+
ExprKind::If(ref cond, ref then, ref otherwise) => {
337+
check_expr(cx, cond, bindings);
338+
check_expr(cx, &**then, bindings);
339+
if let Some(ref o) = *otherwise {
340+
check_expr(cx, o, bindings);
341+
}
342+
},
336343
ExprKind::Match(ref init, arms, _) => {
337344
check_expr(cx, init, bindings);
338345
let len = bindings.len();

0 commit comments

Comments
 (0)