toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace last bail! invocations.

Browse Source
This commit is contained in:
Jordan Petridis 2018-02-05 19:00:31 +02:00
parent 008f57bec4
commit 44ebe46f10
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hammond-data/src/errors.rs
View File

@ -46,6 +46,10 @@ pub enum DataError {
}, },
#[fail(display = "Error occured while Parsing an Episode. Reason: {}", reason)] #[fail(display = "Error occured while Parsing an Episode. Reason: {}", reason)]
ParseEpisodeError { reason: String, parent_id: i32 }, ParseEpisodeError { reason: String, parent_id: i32 },
#[fail(display = "No Futures where produced to be run.")]
EmptyFuturesList,
#[fail(display = "Episode was not changed and thus skipped.")]
EpisodeNotChanged,
} }
impl From<RunMigrationsError> for DataError { impl From<RunMigrationsError> for DataError {

2
hammond-data/src/feed.rs
View File

@ -96,7 +96,7 @@ impl Feed {
// I am not sure what the optimizations are on match vs allocating None. // I am not sure what the optimizations are on match vs allocating None.
.map(|fut| { .map(|fut| {
fut.and_then(|x| match x { fut.and_then(|x| match x {
IndexState::NotChanged => return Err(DataError::DiscountBail(format!("Nothing to do here."))), IndexState::NotChanged => return Err(DataError::EpisodeNotChanged),
_ => Ok(x), _ => Ok(x),
}) })
}) })

2
hammond-data/src/lib.rs
View File

@ -27,7 +27,7 @@ extern crate derive_builder;
extern crate diesel; extern crate diesel;
#[macro_use] #[macro_use]
extern crate diesel_migrations; extern crate diesel_migrations;
#[macro_use] // #[macro_use]
extern crate failure; extern crate failure;
#[macro_use] #[macro_use]
extern crate failure_derive; extern crate failure_derive;

4
hammond-data/src/pipeline.rs
View File

@ -58,9 +58,7 @@ pub fn pipeline<S: IntoIterator<Item = Source>>(
.collect(); .collect();
if list.is_empty() { if list.is_empty() {
return Err(DataError::DiscountBail(format!( return Err(DataError::EmptyFuturesList);
"No futures were found to run."
)));
} }
// Thats not really concurrent yet I think. // Thats not really concurrent yet I think.