diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions.rs | 2 | ||||
| -rw-r--r-- | src/arg_parser.rs | 2 | ||||
| -rw-r--r-- | src/download.rs | 12 | ||||
| -rw-r--r-- | src/utils.rs | 5 |
4 files changed, 12 insertions, 9 deletions
diff --git a/src/actions.rs b/src/actions.rs index 2ae30f5..1eb42d1 100644 --- a/src/actions.rs +++ b/src/actions.rs @@ -77,7 +77,7 @@ pub fn update_subscription(sub: &mut Subscription) -> Result<()> { podcast.episodes()[..podcast.episodes().len() - sub.num_episodes] .par_iter() .map(|ep| download::download(podcast.title(), ep)) - .flat_map(|e| e.err()) + .flat_map(std::result::Result::err) .for_each(|err| eprintln!("Error: {}", err)); } sub.num_episodes = podcast.episodes().len(); diff --git a/src/arg_parser.rs b/src/arg_parser.rs index 6438af3..4d2dda6 100644 --- a/src/arg_parser.rs +++ b/src/arg_parser.rs @@ -147,6 +147,6 @@ pub fn search(state: &mut State, config: Config, matches: &ArgMatches) -> Result Some(r) => sub(state, config, r)?, None => eprintln!("Subscription failed. No url in API response."), } - + Ok(()) } diff --git a/src/download.rs b/src/download.rs index 7acc0b0..dd87857 100644 --- a/src/download.rs +++ b/src/download.rs @@ -24,7 +24,7 @@ pub fn download_range(state: &State, p_search: &str, e_search: &str) -> Result<( .par_iter() .map(|ep_num| &episodes[episodes.len() - ep_num]) .map(|ep| download(podcast.title(), ep)) - .flat_map(|e| e.err()) + .flat_map(std::result::Result::err) .for_each(|err| println!("Error: {}", err)); } } @@ -109,13 +109,13 @@ pub fn download_episode_by_name( if download_all { filtered_episodes .map(|ep| download(podcast.title(), ep)) - .flat_map(|e| e.err()) + .flat_map(std::result::Result::err) .for_each(|err| eprintln!("Error: {}", err)); } else { filtered_episodes .take(1) .map(|ep| download(podcast.title(), ep)) - .flat_map(|e| e.err()) + .flat_map(std::result::Result::err) .for_each(|err| eprintln!("Error: {}", err)); } } @@ -150,7 +150,7 @@ pub fn download_all(state: &State, p_search: &str) -> Result<(), Error> { .filter(|e| e.title().is_some()) .filter(|e| !downloaded.contains(&e.title().unwrap())) .map(|e| download(podcast.title(), e)) - .flat_map(|e| e.err()) + .flat_map(std::result::Result::err) .for_each(|err| eprintln!("Error: {}", err)) })?; } @@ -175,7 +175,7 @@ pub fn download_rss(config: Config, url: &str) -> Result<(), Error> { episodes[..download_limit] .par_iter() .map(|ep| download(podcast.title(), ep)) - .flat_map(|e| e.err()) + .flat_map(std::result::Result::err) .for_each(|err| eprintln!("Error downloading {}: {}", podcast.title(), err)); } Ok(()) @@ -190,7 +190,7 @@ fn parse_download_episodes(e_search: &str) -> Result<HashSet<usize>, Error> { if elem.contains('-') { let range: Vec<usize> = elem .split('-') - .map(|i| i.parse::<usize>()) + .map(str::parse) .collect::<Result<Vec<usize>, std::num::ParseIntError>>()?; ranges.push((range[0], range[1])); } else { diff --git a/src/utils.rs b/src/utils.rs index 21b01a7..7bc68fa 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -21,7 +21,10 @@ pub fn trim_extension(filename: &str) -> Option<String> { } pub fn find_extension(input: &str) -> Option<String> { - let s: Vec<String> = input.split('.').map(|s| s.to_string()).collect(); + let s: Vec<String> = input + .split('.') + .map(std::string::ToString::to_string) + .collect(); if s.len() > 1 { return s.last().cloned(); } |