filter_map_bool_then

Author: Urhengulas

Cargo.toml

@@ -174,7 +174,6 @@ derived_hash_with_manual_eq = "allow"
 field_reassign_with_default = "allow"
 forget_non_drop = "allow"
 format_collect = "allow"
-filter_map_bool_then = "allow"
 if_same_then_else = "allow"
 large_enum_variant = "allow"
 match_like_matches_macro = "allow"

crates/hir-def/src/generics.rs

@@ -400,9 +400,8 @@ impl GenericParams {
                             params
                                 .type_or_consts
                                 .iter()
-                                .filter_map(|(idx, param)| {
-                                    enabled(idx.into()).then(|| param.clone())
-                                })
+                                .filter(|(idx, _)| enabled((*idx).into()))
+                                .map(|(_, param)| param.clone())
                                 .collect()
                         }),
                     lifetimes: all_lifetimes_enabled
@@ -411,9 +410,8 @@ impl GenericParams {
                             params
                                 .lifetimes
                                 .iter()
-                                .filter_map(|(idx, param)| {
-                                    enabled(idx.into()).then(|| param.clone())
-                                })
+                                .filter(|(idx, _)| enabled((*idx).into()))
+                                .map(|(_, param)| param.clone())
                                 .collect()
                         }),
                     where_predicates: params.where_predicates.clone(),