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

Auto merge of #11866 - GuillaumeGomez:simplify-code-result_map_or_else_none, r=flip1995

Browse source 
Simplify code for `result_map_or_else_none`

As mentioned in https://github.com/rust-lang/rust-clippy/pull/11864.

r? `@flip1995`

changelog: Simplify code for `result_map_or_else_none`
This commit is contained in:
bors 2023-11-25 11:24:17 +00:00
commit fbf13cea16
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
clippy_lints/src/methods/result_map_or_else_none.rs
View file

@ -18,17 +18,13 @@ pub(super) fn check<'tcx>(
def_arg: &'tcx hir::Expr<'_>,
map_arg: &'tcx hir::Expr<'_>,
) {
let is_result = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result);
if !is_result {
return;
}
let f_arg_is_some = is_res_lang_ctor(cx, path_res(cx, map_arg), OptionSome);
if f_arg_is_some
// lint if the caller of `map_or_else()` is a `Result`
if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result)
// We check that it is mapped as `Some`.
&& is_res_lang_ctor(cx, path_res(cx, map_arg), OptionSome)
&& let hir::ExprKind::Closure(&hir::Closure { body, .. }) = def_arg.kind
&& let body = cx.tcx.hir().body(body)
// And finally we check that we return a `None` in the "else case".
&& is_res_lang_ctor(cx, path_res(cx, peel_blocks(body.value)), OptionNone)
{
let msg = "called `map_or_else(|_| None, Some)` on a `Result` value";