Skip to content

Commit 430235e

Browse files
Jacherrsamueltardieu
Jacherr
authored and
samueltardieu
committed
new lint unnecessary_map_or 
1 parent 3518178 commit 430235e

File tree

80 files changed

+588
-166
lines changed

Some content is hidden

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

80 files changed

+588
-166
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -6071,6 +6071,7 @@ Released 2018-09-13
60716071
[`unnecessary_literal_bound`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_literal_bound
60726072
[`unnecessary_literal_unwrap`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_literal_unwrap
60736073
[`unnecessary_map_on_constructor`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_map_on_constructor
6074+
[`unnecessary_map_or`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_map_or
60746075
[`unnecessary_min_or_max`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_min_or_max
60756076
[`unnecessary_mut_passed`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_mut_passed
60766077
[`unnecessary_operation`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_operation

‎clippy_dev/src/setup/vscode.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fn delete_vs_task_file(path: &Path) -> bool {
8484
/// It may fail silently.
8585
fn try_delete_vs_directory_if_empty() {
8686
let path = Path::new(VSCODE_DIR);
87-
if path.read_dir().map_or(false, |mut iter| iter.next().is_none()) {
87+
if path.read_dir().is_ok_and(|mut iter| iter.next().is_none()) {
8888
// The directory is empty. We just try to delete it but allow a silence
8989
// fail as an empty `.vscode` directory is still valid
9090
let _silence_result = fs::remove_dir(path);

‎clippy_lints/src/attrs/useless_attribute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub(super) fn check(cx: &EarlyContext<'_>, item: &Item, attrs: &[Attribute]) {
1616
return;
1717
}
1818
if let Some(lint_list) = &attr.meta_item_list() {
19-
if attr.ident().map_or(false, |ident| is_lint_level(ident.name, attr.id)) {
19+
if attr.ident().is_some_and(|ident| is_lint_level(ident.name, attr.id)) {
2020
for lint in lint_list {
2121
match item.kind {
2222
ItemKind::Use(..) => {

‎clippy_lints/src/attrs/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn is_relevant_block(cx: &LateContext<'_>, typeck_results: &ty::TypeckResults<'_
5050
block
5151
.expr
5252
.as_ref()
53-
.map_or(false, |e| is_relevant_expr(cx, typeck_results, e)),
53+
.is_some_and(|e| is_relevant_expr(cx, typeck_results, e)),
5454
|stmt| match &stmt.kind {
5555
StmtKind::Let(_) => true,
5656
StmtKind::Expr(expr) | StmtKind::Semi(expr) => is_relevant_expr(cx, typeck_results, expr),
@@ -60,7 +60,7 @@ fn is_relevant_block(cx: &LateContext<'_>, typeck_results: &ty::TypeckResults<'_
6060
}
6161

6262
fn is_relevant_expr(cx: &LateContext<'_>, typeck_results: &ty::TypeckResults<'_>, expr: &Expr<'_>) -> bool {
63-
if macro_backtrace(expr.span).last().map_or(false, |macro_call| {
63+
if macro_backtrace(expr.span).last().is_some_and(|macro_call| {
6464
is_panic(cx, macro_call.def_id) || cx.tcx.item_name(macro_call.def_id) == sym::unreachable
6565
}) {
6666
return false;

‎clippy_lints/src/bool_assert_comparison.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ fn is_impl_not_trait_with_bool_out<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -
6060
trait_id,
6161
)
6262
})
63-
.map_or(false, |assoc_item| {
64-
let proj = Ty::new_projection_from_args(cx.tcx, assoc_item.def_id, cx.tcx.mk_args_trait(ty, []));
63+
.is_some_and(|assoc_item| {
64+
let proj = Ty::new_projection(cx.tcx, assoc_item.def_id, cx.tcx.mk_args_trait(ty, []));
6565
let nty = cx.tcx.normalize_erasing_regions(cx.param_env, proj);
6666

6767
nty.is_bool()

‎clippy_lints/src/booleans.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -667,5 +667,5 @@ fn implements_ord(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
667667
let ty = cx.typeck_results().expr_ty(expr);
668668
cx.tcx
669669
.get_diagnostic_item(sym::Ord)
670-
.map_or(false, |id| implements_trait(cx, ty, id, &[]))
670+
.is_some_and(|id| implements_trait(cx, ty, id, &[]))
671671
}

‎clippy_lints/src/box_default.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl LateLintPass<'_> for BoxDefault {
4545
// And that method is `new`
4646
&& seg.ident.name == sym::new
4747
// And the call is that of a `Box` method
48-
&& path_def_id(cx, ty).map_or(false, |id| Some(id) == cx.tcx.lang_items().owned_box())
48+
&& path_def_id(cx, ty).is_some_and(|id| Some(id) == cx.tcx.lang_items().owned_box())
4949
// And the single argument to the call is another function call
5050
// This is the `T::default()` (or default equivalent) of `Box::new(T::default())`
5151
&& let ExprKind::Call(arg_path, _) = arg.kind
@@ -83,9 +83,9 @@ fn is_plain_default(cx: &LateContext<'_>, arg_path: &Expr<'_>) -> bool {
8383
}
8484

8585
fn is_local_vec_expn(cx: &LateContext<'_>, expr: &Expr<'_>, ref_expr: &Expr<'_>) -> bool {
86-
macro_backtrace(expr.span).next().map_or(false, |call| {
87-
cx.tcx.is_diagnostic_item(sym::vec_macro, call.def_id) && call.span.eq_ctxt(ref_expr.span)
88-
})
86+
macro_backtrace(expr.span)
87+
.next()
88+
.is_some_and(|call| cx.tcx.is_diagnostic_item(sym::vec_macro, call.def_id) && call.span.eq_ctxt(ref_expr.span))
8989
}
9090

9191
#[derive(Default)]

‎clippy_lints/src/casts/unnecessary_cast.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ pub(super) fn check<'tcx>(
159159
// The same is true if the expression encompassing the cast expression is a unary
160160
// expression or an addressof expression.
161161
let needs_block = matches!(cast_expr.kind, ExprKind::Unary(..) | ExprKind::AddrOf(..))
162-
|| get_parent_expr(cx, expr)
163-
.map_or(false, |e| matches!(e.kind, ExprKind::Unary(..) | ExprKind::AddrOf(..)));
162+
|| get_parent_expr(cx, expr).is_some_and(|e| matches!(e.kind, ExprKind::Unary(..) | ExprKind::AddrOf(..)));
164163

165164
span_lint_and_sugg(
166165
cx,

‎clippy_lints/src/comparison_chain.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl<'tcx> LateLintPass<'tcx> for ComparisonChain {
110110
let is_ord = cx
111111
.tcx
112112
.get_diagnostic_item(sym::Ord)
113-
.map_or(false, |id| implements_trait(cx, ty, id, &[]));
113+
.is_some_and(|id| implements_trait(cx, ty, id, &[]));
114114

115115
if !is_ord {
116116
return;

‎clippy_lints/src/copies.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ fn eq_binding_names(s: &Stmt<'_>, names: &[(HirId, Symbol)]) -> bool {
345345
let mut i = 0usize;
346346
let mut res = true;
347347
l.pat.each_binding_or_first(&mut |_, _, _, name| {
348-
if names.get(i).map_or(false, |&(_, n)| n == name.name) {
348+
if names.get(i).is_some_and(|&(_, n)| n == name.name) {
349349
i += 1;
350350
} else {
351351
res = false;
@@ -389,12 +389,10 @@ fn eq_stmts(
389389
let new_bindings = &moved_bindings[old_count..];
390390
blocks
391391
.iter()
392-
.all(|b| get_stmt(b).map_or(false, |s| eq_binding_names(s, new_bindings)))
392+
.all(|b| get_stmt(b).is_some_and(|s| eq_binding_names(s, new_bindings)))
393393
} else {
394394
true
395-
}) && blocks
396-
.iter()
397-
.all(|b| get_stmt(b).map_or(false, |s| eq.eq_stmt(s, stmt)))
395+
}) && blocks.iter().all(|b| get_stmt(b).is_some_and(|s| eq.eq_stmt(s, stmt)))
398396
}
399397

400398
#[expect(clippy::too_many_lines)]
@@ -451,9 +449,7 @@ fn scan_block_for_eq<'tcx>(
451449
// x + 50
452450
let expr_hash_eq = if let Some(e) = block.expr {
453451
let hash = hash_expr(cx, e);
454-
blocks
455-
.iter()
456-
.all(|b| b.expr.map_or(false, |e| hash_expr(cx, e) == hash))
452+
blocks.iter().all(|b| b.expr.is_some_and(|e| hash_expr(cx, e) == hash))
457453
} else {
458454
blocks.iter().all(|b| b.expr.is_none())
459455
};
@@ -514,7 +510,7 @@ fn scan_block_for_eq<'tcx>(
514510
});
515511
if let Some(e) = block.expr {
516512
for block in blocks {
517-
if block.expr.map_or(false, |expr| !eq.eq_expr(expr, e)) {
513+
if block.expr.is_some_and(|expr| !eq.eq_expr(expr, e)) {
518514
moved_locals.truncate(moved_locals_at_start);
519515
return BlockEq {
520516
start_end_eq,
@@ -533,7 +529,7 @@ fn scan_block_for_eq<'tcx>(
533529
}
534530

535531
fn check_for_warn_of_moved_symbol(cx: &LateContext<'_>, symbols: &[(HirId, Symbol)], if_expr: &Expr<'_>) -> bool {
536-
get_enclosing_block(cx, if_expr.hir_id).map_or(false, |block| {
532+
get_enclosing_block(cx, if_expr.hir_id).is_some_and(|block| {
537533
let ignore_span = block.span.shrink_to_lo().to(if_expr.span);
538534

539535
symbols

‎clippy_lints/src/declared_lints.rs

+1
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ pub static LINTS: &[&crate::LintInfo] = &[
481481
crate::methods::UNNECESSARY_JOIN_INFO,
482482
crate::methods::UNNECESSARY_LAZY_EVALUATIONS_INFO,
483483
crate::methods::UNNECESSARY_LITERAL_UNWRAP_INFO,
484+
crate::methods::UNNECESSARY_MAP_OR_INFO,
484485
crate::methods::UNNECESSARY_MIN_OR_MAX_INFO,
485486
crate::methods::UNNECESSARY_RESULT_MAP_OR_ELSE_INFO,
486487
crate::methods::UNNECESSARY_SORT_BY_INFO,

‎clippy_lints/src/default_numeric_fallback.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,6 @@ impl<'tcx> From<Ty<'tcx>> for ExplicitTyBound {
253253

254254
impl<'tcx> From<Option<Ty<'tcx>>> for ExplicitTyBound {
255255
fn from(v: Option<Ty<'tcx>>) -> Self {
256-
Self(v.map_or(false, Ty::is_numeric))
256+
Self(v.is_some_and(Ty::is_numeric))
257257
}
258258
}

‎clippy_lints/src/derivable_impls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn is_path_self(e: &Expr<'_>) -> bool {
8181
fn contains_trait_object(ty: Ty<'_>) -> bool {
8282
match ty.kind() {
8383
ty::Ref(_, ty, _) => contains_trait_object(*ty),
84-
ty::Adt(def, args) => def.is_box() && args[0].as_type().map_or(false, contains_trait_object),
84+
ty::Adt(def, args) => def.is_box() && args[0].as_type().is_some_and(contains_trait_object),
8585
ty::Dynamic(..) => true,
8686
_ => false,
8787
}

‎clippy_lints/src/derive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ fn check_copy_clone<'tcx>(cx: &LateContext<'tcx>, item: &Item<'_>, trait_ref: &h
327327
// there's a Copy impl for any instance of the adt.
328328
if !is_copy(cx, ty) {
329329
if ty_subs.non_erasable_generics().next().is_some() {
330-
let has_copy_impl = cx.tcx.all_local_trait_impls(()).get(&copy_id).map_or(false, |impls| {
330+
let has_copy_impl = cx.tcx.all_local_trait_impls(()).get(&copy_id).is_some_and(|impls| {
331331
impls.iter().any(|&id| {
332332
matches!(cx.tcx.type_of(id).instantiate_identity().kind(), ty::Adt(adt, _)
333333
if ty_adt.did() == adt.did())

‎clippy_lints/src/doc/missing_headers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub fn check(
4747
),
4848
_ => (),
4949
}
50-
if !headers.panics && panic_info.map_or(false, |el| !el.1) {
50+
if !headers.panics && panic_info.is_some_and(|el| !el.1) {
5151
span_lint_and_note(
5252
cx,
5353
MISSING_PANICS_DOC,

‎clippy_lints/src/drop_forget_ref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl<'tcx> LateLintPass<'tcx> for DropForgetRef {
112112
MEM_FORGET,
113113
Cow::Owned(format!(
114114
"usage of `mem::forget` on {}",
115-
if arg_ty.ty_adt_def().map_or(false, |def| def.has_dtor(cx.tcx)) {
115+
if arg_ty.ty_adt_def().is_some_and(|def| def.has_dtor(cx.tcx)) {
116116
"`Drop` type"
117117
} else {
118118
"type with `Drop` fields"

‎clippy_lints/src/eta_reduction.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ fn check_clousure<'tcx>(cx: &LateContext<'tcx>, outer_receiver: Option<&Expr<'tc
196196
{
197197
span_lint_and_then(cx, REDUNDANT_CLOSURE, expr.span, "redundant closure", |diag| {
198198
if let Some(mut snippet) = snippet_opt(cx, callee.span) {
199-
if path_to_local(callee).map_or(false, |l| {
199+
if path_to_local(callee).is_some_and(|l| {
200200
// FIXME: Do we really need this `local_used_in` check?
201201
// Isn't it checking something like... `callee(callee)`?
202202
// If somehow this check is needed, add some test for it,

‎clippy_lints/src/functions/not_unsafe_ptr_arg_deref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fn raw_ptr_arg(cx: &LateContext<'_>, arg: &hir::Param<'_>) -> Option<HirId> {
8787
}
8888

8989
fn check_arg(cx: &LateContext<'_>, raw_ptrs: &HirIdSet, arg: &hir::Expr<'_>) {
90-
if path_to_local(arg).map_or(false, |id| raw_ptrs.contains(&id)) {
90+
if path_to_local(arg).is_some_and(|id| raw_ptrs.contains(&id)) {
9191
span_lint(
9292
cx,
9393
NOT_UNSAFE_PTR_ARG_DEREF,

‎clippy_lints/src/infinite_iter.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,13 @@ fn is_infinite(cx: &LateContext<'_>, expr: &Expr<'_>) -> Finiteness {
171171
if let ExprKind::Path(ref qpath) = path.kind {
172172
cx.qpath_res(qpath, path.hir_id)
173173
.opt_def_id()
174-
.map_or(false, |id| cx.tcx.is_diagnostic_item(sym::iter_repeat, id))
174+
.is_some_and(|id| cx.tcx.is_diagnostic_item(sym::iter_repeat, id))
175175
.into()
176176
} else {
177177
Finite
178178
}
179179
},
180-
ExprKind::Struct(..) => higher::Range::hir(expr).map_or(false, |r| r.end.is_none()).into(),
180+
ExprKind::Struct(..) => higher::Range::hir(expr).is_some_and(|r| r.end.is_none()).into(),
181181
_ => Finite,
182182
}
183183
}
@@ -228,9 +228,7 @@ fn complete_infinite_iter(cx: &LateContext<'_>, expr: &Expr<'_>) -> Finiteness {
228228
let not_double_ended = cx
229229
.tcx
230230
.get_diagnostic_item(sym::DoubleEndedIterator)
231-
.map_or(false, |id| {
232-
!implements_trait(cx, cx.typeck_results().expr_ty(receiver), id, &[])
233-
});
231+
.is_some_and(|id| !implements_trait(cx, cx.typeck_results().expr_ty(receiver), id, &[]));
234232
if not_double_ended {
235233
return is_infinite(cx, receiver);
236234
}

‎clippy_lints/src/item_name_repetitions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ fn check_enum_start(cx: &LateContext<'_>, item_name: &str, variant: &Variant<'_>
309309
let item_name_chars = item_name.chars().count();
310310

311311
if count_match_start(item_name, name).char_count == item_name_chars
312-
&& name.chars().nth(item_name_chars).map_or(false, |c| !c.is_lowercase())
313-
&& name.chars().nth(item_name_chars + 1).map_or(false, |c| !c.is_numeric())
312+
&& name.chars().nth(item_name_chars).is_some_and(|c| !c.is_lowercase())
313+
&& name.chars().nth(item_name_chars + 1).is_some_and(|c| !c.is_numeric())
314314
{
315315
span_lint_hir(
316316
cx,

‎clippy_lints/src/iter_not_returning_iterator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fn check_sig(cx: &LateContext<'_>, name: Symbol, sig: &FnSig<'_>, fn_id: LocalDe
7575
if cx
7676
.tcx
7777
.get_diagnostic_item(sym::Iterator)
78-
.map_or(false, |iter_id| !implements_trait(cx, ret_ty, iter_id, &[]))
78+
.is_some_and(|iter_id| !implements_trait(cx, ret_ty, iter_id, &[]))
7979
{
8080
span_lint(
8181
cx,

‎clippy_lints/src/len_zero.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ fn has_is_empty(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
622622

623623
let ty = &cx.typeck_results().expr_ty(expr).peel_refs();
624624
match ty.kind() {
625-
ty::Dynamic(tt, ..) => tt.principal().map_or(false, |principal| {
625+
ty::Dynamic(tt, ..) => tt.principal().is_some_and(|principal| {
626626
let is_empty = sym!(is_empty);
627627
cx.tcx
628628
.associated_items(principal.def_id())

‎clippy_lints/src/lifetimes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ fn elision_suggestions(
737737
suggestions.extend(
738738
usages
739739
.iter()
740-
.filter(|usage| named_lifetime(usage).map_or(false, |id| elidable_lts.contains(&id)))
740+
.filter(|usage| named_lifetime(usage).is_some_and(|id| elidable_lts.contains(&id)))
741741
.map(|usage| {
742742
match cx.tcx.parent_hir_node(usage.hir_id) {
743743
Node::Ty(Ty {

‎clippy_lints/src/loops/manual_find.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub(super) fn check<'tcx>(
5858
.tcx
5959
.lang_items()
6060
.copy_trait()
61-
.map_or(false, |id| implements_trait(cx, ty, id, &[]))
61+
.is_some_and(|id| implements_trait(cx, ty, id, &[]))
6262
{
6363
snippet.push_str(
6464
&format!(

‎clippy_lints/src/loops/manual_memcpy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ fn get_assignments<'a, 'tcx>(
416416
.chain(*expr)
417417
.filter(move |e| {
418418
if let ExprKind::AssignOp(_, place, _) = e.kind {
419-
path_to_local(place).map_or(false, |id| {
419+
path_to_local(place).is_some_and(|id| {
420420
!loop_counters
421421
.iter()
422422
// skip the first item which should be `StartKind::Range`

‎clippy_lints/src/loops/mut_range_bound.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl BreakAfterExprVisitor {
126126
break_after_expr: false,
127127
};
128128

129-
get_enclosing_block(cx, hir_id).map_or(false, |block| {
129+
get_enclosing_block(cx, hir_id).is_some_and(|block| {
130130
visitor.visit_block(block);
131131
visitor.break_after_expr
132132
})

‎clippy_lints/src/loops/same_item_push.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub(super) fn check<'tcx>(
5050
.tcx
5151
.lang_items()
5252
.clone_trait()
53-
.map_or(false, |id| implements_trait(cx, ty, id, &[]))
53+
.is_some_and(|id| implements_trait(cx, ty, id, &[]))
5454
{
5555
// Make sure that the push does not involve possibly mutating values
5656
match pushed_item.kind {

‎clippy_lints/src/loops/utils.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,10 @@ fn is_conditional(expr: &Expr<'_>) -> bool {
256256
/// If `arg` was the argument to a `for` loop, return the "cleanest" way of writing the
257257
/// actual `Iterator` that the loop uses.
258258
pub(super) fn make_iterator_snippet(cx: &LateContext<'_>, arg: &Expr<'_>, applic_ref: &mut Applicability) -> String {
259-
let impls_iterator = cx.tcx.get_diagnostic_item(sym::Iterator).map_or(false, |id| {
260-
implements_trait(cx, cx.typeck_results().expr_ty(arg), id, &[])
261-
});
259+
let impls_iterator = cx
260+
.tcx
261+
.get_diagnostic_item(sym::Iterator)
262+
.is_some_and(|id| implements_trait(cx, cx.typeck_results().expr_ty(arg), id, &[]));
262263
if impls_iterator {
263264
format!(
264265
"{}",

‎clippy_lints/src/manual_clamp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ impl TypeClampability {
226226
} else if cx
227227
.tcx
228228
.get_diagnostic_item(sym::Ord)
229-
.map_or(false, |id| implements_trait(cx, ty, id, &[]))
229+
.is_some_and(|id| implements_trait(cx, ty, id, &[]))
230230
{
231231
Some(TypeClampability::Ord)
232232
} else {

‎clippy_lints/src/manual_strip.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ fn eq_pattern_length<'tcx>(cx: &LateContext<'tcx>, pattern: &Expr<'_>, expr: &'t
162162
..
163163
}) = expr.kind
164164
{
165-
constant_length(cx, pattern).map_or(false, |length| *n == length)
165+
constant_length(cx, pattern).is_some_and(|length| *n == length)
166166
} else {
167-
len_arg(cx, expr).map_or(false, |arg| eq_expr_value(cx, pattern, arg))
167+
len_arg(cx, expr).is_some_and(|arg| eq_expr_value(cx, pattern, arg))
168168
}
169169
}
170170

‎clippy_lints/src/matches/match_like_matches.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ where
7474
&& b0 != b1
7575
&& (first_guard.is_none() || iter.len() == 0)
7676
&& first_attrs.is_empty()
77-
&& iter.all(|arm| find_bool_lit(&arm.2.kind).map_or(false, |b| b == b0) && arm.3.is_none() && arm.0.is_empty())
77+
&& iter.all(|arm| find_bool_lit(&arm.2.kind).is_some_and(|b| b == b0) && arm.3.is_none() && arm.0.is_empty())
7878
{
7979
if let Some(last_pat) = last_pat_opt {
8080
if !is_wild(last_pat) {

‎clippy_lints/src/matches/redundant_pattern_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ fn is_pat_variant(cx: &LateContext<'_>, pat: &Pat<'_>, path: &QPath<'_>, expecte
447447
.tcx
448448
.lang_items()
449449
.get(expected_lang_item)
450-
.map_or(false, |expected_id| cx.tcx.parent(id) == expected_id),
450+
.is_some_and(|expected_id| cx.tcx.parent(id) == expected_id),
451451
Item::Diag(expected_ty, expected_variant) => {
452452
let ty = cx.typeck_results().pat_ty(pat);
453453

‎clippy_lints/src/matches/single_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl<'tcx> Visitor<'tcx> for PatVisitor<'tcx> {
175175
if matches!(pat.kind, PatKind::Binding(..)) {
176176
ControlFlow::Break(())
177177
} else {
178-
self.has_enum |= self.typeck.pat_ty(pat).ty_adt_def().map_or(false, AdtDef::is_enum);
178+
self.has_enum |= self.typeck.pat_ty(pat).ty_adt_def().is_some_and(AdtDef::is_enum);
179179
walk_pat(self, pat)
180180
}
181181
}

‎clippy_lints/src/matches/try_err.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, scrutine
5858
let span = hygiene::walk_chain(err_arg.span, try_arg.span.ctxt());
5959
let mut applicability = Applicability::MachineApplicable;
6060
let origin_snippet = snippet_with_applicability(cx, span, "_", &mut applicability);
61-
let ret_prefix = if get_parent_expr(cx, expr).map_or(false, |e| matches!(e.kind, ExprKind::Ret(_))) {
61+
let ret_prefix = if get_parent_expr(cx, expr).is_some_and(|e| matches!(e.kind, ExprKind::Ret(_))) {
6262
"" // already returns
6363
} else {
6464
"return "

0 commit comments

Comments
 (0)