Fix tools

Author: compiler-errors

clippy_lints/src/derive.rs

@@ -386,7 +386,6 @@ fn check_unsafe_derive_deserialize<'tcx>(
 .tcx
 .inherent_impls(def.did())
 .into_iter()
-.flatten()
 .map(|imp_did| cx.tcx.hir().expect_item(imp_did.expect_local()))
 .any(|imp| has_unsafe(cx, imp))
 {

clippy_lints/src/inherent_impl.rs

@@ -51,9 +51,7 @@ impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
 // List of spans to lint. (lint_span, first_span)
 letmut lint_spans = Vec::new();
 
-letOk(impls) = cx.tcx.crate_inherent_impls(())else{
-return;
-};
+let(impls, _) = cx.tcx.crate_inherent_impls(());
 
 for(&id, impl_ids)in&impls.inherent_impls{
 if impl_ids.len() < 2

clippy_lints/src/len_zero.rs

@@ -448,7 +448,6 @@ fn check_for_is_empty(
 .tcx
 .inherent_impls(impl_ty)
 .into_iter()
-.flatten()
 .flat_map(|&id| cx.tcx.associated_items(id).filter_by_name_unhygienic(is_empty))
 .find(|item| item.kind == AssocKind::Fn);
 
@@ -616,7 +615,7 @@ fn has_is_empty(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
 /// Checks the inherent impl's items for an `is_empty(self)` method.
 fnhas_is_empty_impl(cx:&LateContext<'_>,id:DefId) -> bool{
 let is_empty = sym!(is_empty);
- cx.tcx.inherent_impls(id).into_iter().flatten().any(|imp| {
+ cx.tcx.inherent_impls(id).into_iter().any(|imp| {
  cx.tcx
 .associated_items(*imp)
 .filter_by_name_unhygienic(is_empty)

clippy_lints/src/methods/or_fun_call.rs

@@ -78,7 +78,6 @@ pub(super) fn check<'tcx>(
  cx.tcx
 .inherent_impls(adt_def.did())
 .into_iter()
-.flatten()
 .flat_map(|impl_id| cx.tcx.associated_items(impl_id).filter_by_name_unhygienic(sugg))
 .find_map(|assoc| {
 if assoc.fn_has_self_parameter

clippy_utils/src/lib.rs

@@ -589,14 +589,11 @@ fn find_primitive_impls<'tcx>(tcx: TyCtxt<'tcx>, name: &str) -> impl Iterator<It
 "f32" => SimplifiedType::Float(FloatTy::F32),
 "f64" => SimplifiedType::Float(FloatTy::F64),
  _ => {
-returnResult::<&[_], rustc_errors::ErrorGuaranteed>::Ok(&[])
-.into_iter()
-.flatten()
-.copied();
+return[].iter().copied();
 },
 };
 
- tcx.incoherent_impls(ty).into_iter().flatten().copied()
+ tcx.incoherent_impls(ty).into_iter().copied()
 }
 
 fnnon_local_item_children_by_name(tcx:TyCtxt<'_>,def_id:DefId,name:Symbol) -> Vec<Res>{
@@ -721,7 +718,6 @@ pub fn def_path_res(tcx: TyCtxt<'_>, path: &[&str]) -> Vec<Res> {
 let inherent_impl_children = tcx
 .inherent_impls(def_id)
 .into_iter()
-.flatten()
 .flat_map(|&impl_def_id| item_children_by_name(tcx, impl_def_id, segment));
 
 let direct_children = item_children_by_name(tcx, def_id, segment);

clippy_utils/src/ty.rs

@@ -1316,7 +1316,7 @@ pub fn deref_chain<'cx, 'tcx>(cx: &'cx LateContext<'tcx>, ty: Ty<'tcx>) -> impl
 /// If you need this, you should wrap this call in `clippy_utils::ty::deref_chain().any(...)`.
 pubfnget_adt_inherent_method<'a>(cx:&'aLateContext<'_>,ty:Ty<'_>,method_name:Symbol) -> Option<&'aAssocItem>{
 ifletSome(ty_did) = ty.ty_adt_def().map(AdtDef::did){
- cx.tcx.inherent_impls(ty_did).into_iter().flatten().find_map(|&did| {
+ cx.tcx.inherent_impls(ty_did).into_iter().find_map(|&did| {
  cx.tcx
 .associated_items(did)
 .filter_by_name_unhygienic(method_name)