From d593603b35129dedd9510ff13379d1b2298264e1 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sun, 2 Sep 2018 21:44:56 +0300 Subject: [PATCH] Feed: Remove another unnecessary wrapper --- podcasts-data/src/feed.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/podcasts-data/src/feed.rs b/podcasts-data/src/feed.rs index 2e4be57..a39a8a1 100644 --- a/podcasts-data/src/feed.rs +++ b/podcasts-data/src/feed.rs @@ -40,7 +40,8 @@ impl Feed { // Parse the episodes let episodes = stream.filter_map(move |item| { - glue(&item, pd.id()) + NewEpisodeMinimal::new(&item, pd.id()) + .and_then(move |ep| determine_ep_state(ep, &item)) .map_err(|err| error!("Failed to parse an episode: {}", err)) .ok() }); @@ -52,10 +53,6 @@ impl Feed { } } -fn glue(item: &rss::Item, id: i32) -> Result, DataError> { - NewEpisodeMinimal::new(item, id).and_then(move |ep| determine_ep_state(ep, item)) -} - fn determine_ep_state( ep: NewEpisodeMinimal, item: &rss::Item,