From aa1d0161d3ee9055cbaa9f90c52b79444c1c39a4 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 27 Aug 2018 21:08:29 +0300 Subject: [PATCH] cargo fmt --- podcasts-data/src/feed.rs | 29 +++++++++++++------------ podcasts-data/src/models/new_episode.rs | 3 ++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/podcasts-data/src/feed.rs b/podcasts-data/src/feed.rs index 93c382b..55ade4b 100644 --- a/podcasts-data/src/feed.rs +++ b/podcasts-data/src/feed.rs @@ -87,21 +87,22 @@ fn filter_episodes<'a, S>( where S: Stream, Error = DataError> + Send + 'a, { - stream.filter_map(|state| match state { - IndexState::NotChanged => None, - // Update individual rows, and filter them - IndexState::Update((ref ep, rowid)) => { - ep.update(rowid) - .map_err(|err| error!("{}", err)) - .map_err(|_| error!("Failed to index episode: {:?}.", ep.title())) - .ok(); + stream + .filter_map(|state| match state { + IndexState::NotChanged => None, + // Update individual rows, and filter them + IndexState::Update((ref ep, rowid)) => { + ep.update(rowid) + .map_err(|err| error!("{}", err)) + .map_err(|_| error!("Failed to index episode: {:?}.", ep.title())) + .ok(); - None - }, - IndexState::Index(s) => Some(s), - }) - // only Index is left, collect them for batch index - .collect() + None + } + IndexState::Index(s) => Some(s), + }) + // only Index is left, collect them for batch index + .collect() } fn batch_insert_episodes(episodes: &[NewEpisode]) { diff --git a/podcasts-data/src/models/new_episode.rs b/podcasts-data/src/models/new_episode.rs index e61004a..fe24078 100644 --- a/podcasts-data/src/models/new_episode.rs +++ b/podcasts-data/src/models/new_episode.rs @@ -217,7 +217,8 @@ impl NewEpisodeMinimal { let enc = item.enclosure(); // Get the url - let uri = enc.map(|s| url_cleaner(s.url().trim())) + let uri = enc + .map(|s| url_cleaner(s.url().trim())) // Fallback to Rss.Item.link if enclosure is None. .or_else(|| item.link().map(|s| url_cleaner(s.trim())));