Skip to content

Do not remove method call if type is adjusted #15181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion clippy_lints/src/methods/unnecessary_map_or.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ pub(super) fn check<'a>(

let ext_def_span = def.span.until(map.span);

let (sugg, method, applicability) = if let ExprKind::Closure(map_closure) = map.kind
let (sugg, method, applicability) = if cx.typeck_results().expr_adjustments(recv).is_empty()
&& let ExprKind::Closure(map_closure) = map.kind
&& let closure_body = cx.tcx.hir_body(map_closure.body)
&& let closure_body_value = closure_body.value.peel_blocks()
&& let ExprKind::Binary(op, l, r) = closure_body_value.kind
Expand Down
10 changes: 10 additions & 0 deletions tests/ui/unnecessary_map_or.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,13 @@ fn issue14201(a: Option<String>, b: Option<String>, s: &String) -> bool {
//~^ unnecessary_map_or
x && y
}

fn issue15180() {
let s = std::sync::Mutex::new(Some("foo"));
_ = s.lock().unwrap().is_some_and(|s| s == "foo");
//~^ unnecessary_map_or

let s = &&&&Some("foo");
_ = s.is_some_and(|s| s == "foo");
//~^ unnecessary_map_or
}
10 changes: 10 additions & 0 deletions tests/ui/unnecessary_map_or.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,13 @@ fn issue14201(a: Option<String>, b: Option<String>, s: &String) -> bool {
//~^ unnecessary_map_or
x && y
}

fn issue15180() {
let s = std::sync::Mutex::new(Some("foo"));
_ = s.lock().unwrap().map_or(false, |s| s == "foo");
//~^ unnecessary_map_or

let s = &&&&Some("foo");
_ = s.map_or(false, |s| s == "foo");
//~^ unnecessary_map_or
}
26 changes: 25 additions & 1 deletion tests/ui/unnecessary_map_or.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -326,5 +326,29 @@ LL - let y = b.map_or(true, |b| b == *s);
LL + let y = b.is_none_or(|b| b == *s);
|

error: aborting due to 26 previous errors
error: this `map_or` can be simplified
--> tests/ui/unnecessary_map_or.rs:140:9
|
LL | _ = s.lock().unwrap().map_or(false, |s| s == "foo");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: use is_some_and instead
|
LL - _ = s.lock().unwrap().map_or(false, |s| s == "foo");
LL + _ = s.lock().unwrap().is_some_and(|s| s == "foo");
|

error: this `map_or` can be simplified
--> tests/ui/unnecessary_map_or.rs:144:9
|
LL | _ = s.map_or(false, |s| s == "foo");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: use is_some_and instead
|
LL - _ = s.map_or(false, |s| s == "foo");
LL + _ = s.is_some_and(|s| s == "foo");
|

error: aborting due to 28 previous errors

Loading