user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #5933 - mikerite:fix-5927, r=matthiaskrgr

Browse source 
Fix false negative in `option_as_ref_deref`

Closes #5927

changelog: Fix false negative in `option_as_ref_deref`
This commit is contained in:
bors 2020-08-21 23:43:20 +00:00
commit aa3b04ff74
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
clippy_lints/src/methods/mod.rs
View file

@ -3421,7 +3421,12 @@ fn lint_option_as_ref_deref<'tcx>(
];
let is_deref = match map_args[1].kind {
hir::ExprKind::Path(ref expr_qpath) => deref_aliases.iter().any(|path| match_qpath(expr_qpath, path)),
hir::ExprKind::Path(ref expr_qpath) => cx
.qpath_res(expr_qpath, map_args[1].hir_id)
.opt_def_id()
.map_or(false, |fun_def_id| {
deref_aliases.iter().any(|path| match_def_path(cx, fun_def_id, path))
}),
hir::ExprKind::Closure(_, _, body_id, _, _) => {
let closure_body = cx.tcx.hir().body(body_id);
let closure_expr = remove_blocks(&closure_body.value);