From 5f9db11aa1b26b6fb11b6153f897103aede8fcff Mon Sep 17 00:00:00 2001 From: Rowan Lewis Date: Tue, 13 Mar 2018 23:49:13 +0100 Subject: [PATCH] Rust complained about the filter closure being used in `.filter`, use it in the `.for_each` instead. --- hammond-data/src/utils.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hammond-data/src/utils.rs b/hammond-data/src/utils.rs index f3591da..d8fac82 100644 --- a/hammond-data/src/utils.rs +++ b/hammond-data/src/utils.rs @@ -53,14 +53,16 @@ fn delete_played_episodes(filter: F) -> Result<(), DataError> where F: FnOnce episodes .par_iter_mut() - .filter(|ep| ep.local_uri().is_some() && filter(ep)) + .filter(|ep| ep.local_uri().is_some()) .for_each(|ep| { - if let Err(err) = delete_local_content(ep) { - error!("Error while trying to delete file: {:?}", ep.local_uri()); - error!("{}", err); - } else { - info!("Episode {:?} was deleted succesfully.", ep.local_uri()); - }; + if (filter(ep)) { + if let Err(err) = delete_local_content(ep) { + error!("Error while trying to delete file: {:?}", ep.local_uri()); + error!("{}", err); + } else { + info!("Episode {:?} was deleted succesfully.", ep.local_uri()); + }; + } }); Ok(()) }