Skip to content

Commit 953f024

Browse files
borsbors
committed
Auto merge of #6586 - flip1995:rustup, r=flip1995
Rustup r? `@ghost` changelog: FP fix: [`needless_return`] no longer triggers inside macros.
2 parents 00586df + f18cf82 commit 953f024

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+258
-213
lines changed

‎clippy_lints/src/assertions_on_constants.rs

Lines changed: 10 additions & 20 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 2 additions & 4 deletions
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

Lines changed: 9 additions & 7 deletions
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,13 @@ 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+
{
117+
if else_expr.hir_id == expr.hir_id {
118+
return;
117119
}
118120
}
119121

‎clippy_lints/src/copy_iterator.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::utils::{is_copy, match_path, paths, span_lint_and_note};
2-
use rustc_hir::{Item, ItemKind};
2+
use rustc_hir::{Impl, Item, ItemKind};
33
use rustc_lint::{LateContext, LateLintPass};
44
use rustc_session::{declare_lint_pass, declare_tool_lint};
55

@@ -33,10 +33,10 @@ declare_lint_pass!(CopyIterator => [COPY_ITERATOR]);
3333

3434
impl<'tcx> LateLintPass<'tcx> for CopyIterator {
3535
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
36-
if let ItemKind::Impl {
36+
if let ItemKind::Impl(Impl {
3737
of_trait: Some(ref trait_ref),
3838
..
39-
} = item.kind
39+
}) = item.kind
4040
{
4141
let ty = cx.tcx.type_of(cx.tcx.hir().local_def_id(item.hir_id));
4242

‎clippy_lints/src/derive.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use if_chain::if_chain;
77
use rustc_hir::def_id::DefId;
88
use rustc_hir::intravisit::{walk_expr, walk_fn, walk_item, FnKind, NestedVisitorMap, Visitor};
99
use rustc_hir::{
10-
BlockCheckMode, BodyId, Expr, ExprKind, FnDecl, HirId, Item, ItemKind, TraitRef, UnsafeSource, Unsafety,
10+
BlockCheckMode, BodyId, Expr, ExprKind, FnDecl, HirId, Impl, Item, ItemKind, TraitRef, UnsafeSource, Unsafety,
1111
};
1212
use rustc_lint::{LateContext, LateLintPass};
1313
use rustc_middle::hir::map::Map;
@@ -164,10 +164,10 @@ declare_lint_pass!(Derive => [
164164

165165
impl<'tcx> LateLintPass<'tcx> for Derive {
166166
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
167-
if let ItemKind::Impl {
167+
if let ItemKind::Impl(Impl {
168168
of_trait: Some(ref trait_ref),
169169
..
170-
} = item.kind
170+
}) = item.kind
171171
{
172172
let ty = cx.tcx.type_of(cx.tcx.hir().local_def_id(item.hir_id));
173173
let is_automatically_derived = is_automatically_derived(&*item.attrs);

‎clippy_lints/src/doc.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,8 @@ impl<'tcx> LateLintPass<'tcx> for DocMarkdown {
182182
lint_for_missing_headers(cx, item.hir_id, item.span, sig, headers, Some(body_id));
183183
}
184184
},
185-
hir::ItemKind::Impl {
186-
of_trait: ref trait_ref,
187-
..
188-
} => {
189-
self.in_trait_impl = trait_ref.is_some();
185+
hir::ItemKind::Impl(ref impl_) => {
186+
self.in_trait_impl = impl_.of_trait.is_some();
190187
},
191188
_ => {},
192189
}

‎clippy_lints/src/entry.rs

Lines changed: 2 additions & 2 deletions
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/escape.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc_hir::intravisit;
2-
use rustc_hir::{self, AssocItemKind, Body, FnDecl, HirId, HirIdSet, ItemKind, Node};
2+
use rustc_hir::{self, AssocItemKind, Body, FnDecl, HirId, HirIdSet, Impl, ItemKind, Node};
33
use rustc_infer::infer::TyCtxtInferExt;
44
use rustc_lint::{LateContext, LateLintPass};
55
use rustc_middle::ty::{self, TraitRef, Ty};
@@ -80,7 +80,7 @@ impl<'tcx> LateLintPass<'tcx> for BoxedLocal {
8080
let mut trait_self_ty = None;
8181
if let Some(Node::Item(item)) = parent_node {
8282
// If the method is an impl for a trait, don't warn.
83-
if let ItemKind::Impl { of_trait: Some(_), .. } = item.kind {
83+
if let ItemKind::Impl(Impl { of_trait: Some(_), .. }) = item.kind {
8484
return;
8585
}
8686

@@ -181,7 +181,6 @@ impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
181181
if is_non_trait_box(cmt.place.ty()) && !self.is_large_box(cmt.place.ty()) {
182182
self.set.insert(cmt.hir_id);
183183
}
184-
return;
185184
}
186185
}
187186
}

‎clippy_lints/src/fallible_impl_from.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ impl<'tcx> LateLintPass<'tcx> for FallibleImplFrom {
5757
// check for `impl From<???> for ..`
5858
let impl_def_id = cx.tcx.hir().local_def_id(item.hir_id);
5959
if_chain! {
60-
if let hir::ItemKind::Impl{ items: impl_items, .. } = item.kind;
60+
if let hir::ItemKind::Impl(impl_) = &item.kind;
6161
if let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(impl_def_id);
6262
if match_def_path(cx, impl_trait_ref.def_id, &FROM_TRAIT);
6363
then {
64-
lint_impl_body(cx, item.span, impl_items);
64+
lint_impl_body(cx, item.span, impl_.items);
6565
}
6666
}
6767
}

‎clippy_lints/src/floating_point_arithmetic.rs

Lines changed: 3 additions & 3 deletions
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

Lines changed: 7 additions & 0 deletions
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

Lines changed: 2 additions & 2 deletions
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/inherent_impl.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::utils::{in_macro, span_lint_and_then};
44
use rustc_data_structures::fx::FxHashMap;
5-
use rustc_hir::{def_id, Crate, Item, ItemKind};
5+
use rustc_hir::{def_id, Crate, Impl, Item, ItemKind};
66
use rustc_lint::{LateContext, LateLintPass};
77
use rustc_session::{declare_tool_lint, impl_lint_pass};
88
use rustc_span::Span;
@@ -49,11 +49,11 @@ impl_lint_pass!(MultipleInherentImpl => [MULTIPLE_INHERENT_IMPL]);
4949

5050
impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
5151
fn check_item(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'_>) {
52-
if let ItemKind::Impl {
52+
if let ItemKind::Impl(Impl {
5353
ref generics,
5454
of_trait: None,
5555
..
56-
} = item.kind
56+
}) = item.kind
5757
{
5858
// Remember for each inherent implementation encountered its span and generics
5959
// but filter out implementations that have generic params (type or lifetime)

‎clippy_lints/src/len_zero.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc_ast::ast::LitKind;
33
use rustc_data_structures::fx::FxHashSet;
44
use rustc_errors::Applicability;
55
use rustc_hir::def_id::DefId;
6-
use rustc_hir::{AssocItemKind, BinOpKind, Expr, ExprKind, ImplItemRef, Item, ItemKind, TraitItemRef};
6+
use rustc_hir::{AssocItemKind, BinOpKind, Expr, ExprKind, Impl, ImplItemRef, Item, ItemKind, TraitItemRef};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_middle::ty;
99
use rustc_session::{declare_lint_pass, declare_tool_lint};
@@ -115,11 +115,11 @@ impl<'tcx> LateLintPass<'tcx> for LenZero {
115115

116116
match item.kind {
117117
ItemKind::Trait(_, _, _, _, ref trait_items) => check_trait_items(cx, item, trait_items),
118-
ItemKind::Impl {
118+
ItemKind::Impl(Impl {
119119
of_trait: None,
120120
items: ref impl_items,
121121
..
122-
} => check_impl_items(cx, item, impl_items),
122+
}) => check_impl_items(cx, item, impl_items),
123123
_ => (),
124124
}
125125
}

‎clippy_lints/src/let_if_seq.rs

Lines changed: 2 additions & 3 deletions
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

Lines changed: 9 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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;

0 commit comments

Comments
 (0)