diff options
Diffstat (limited to 'src/iter.rs')
-rw-r--r-- | src/iter.rs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/iter.rs b/src/iter.rs index 85463c8..d3d8978 100644 --- a/src/iter.rs +++ b/src/iter.rs @@ -2,10 +2,10 @@ //! use chrono::NaiveDateTime; +use failure::Fallible as Result; +use failure::Error; -use error::KairosError as KE; -use error::KairosErrorKind as KEK; -use error::Result; +use error::ErrorKind as KEK; use timetype::TimeType; use matcher::Matcher; @@ -27,7 +27,7 @@ impl Iter { pub fn build(base: NaiveDateTime, inc: TimeType) -> Result<Iter> { if !inc.is_a_amount() { - Err(KE::from_kind(KEK::ArgumentErrorNotAnAmount(inc))) + Err(Error::from(KEK::ArgumentErrorNotAnAmount(inc))) } else { Ok(Iter { base: TimeType::moment(base), @@ -214,7 +214,7 @@ impl<I> Iterator for UntilIter<I> None } } else { - Some(Err(KE::from_kind(KEK::ArgumentErrorNotAMoment(tt.name())))) + Some(Err(Error::from(KEK::ArgumentErrorNotAMoment(tt.name())))) } } } @@ -284,9 +284,9 @@ impl<I> Times for I pub mod extensions { use timetype::TimeType as TT; use super::Iter; - use error::Result; - use error::KairosError as KE; - use error::KairosErrorKind as KEK; + use failure::Fallible as Result; + use failure::Error; + use error::ErrorKind as KEK; pub trait Minutely { fn minutely(self, i: i64) -> Result<Iter>; @@ -325,7 +325,7 @@ pub mod extensions { assert!(increment.is_a_amount(), "This is a Bug, please report this!"); Iter::build(mom, increment) }, - _ => Err(KE::from_kind(KEK::ArgumentErrorNotAnAmount(self))), + _ => Err(Error::from(KEK::ArgumentErrorNotAnAmount(self))), } } @@ -340,7 +340,7 @@ pub mod extensions { assert!(increment.is_a_amount(), "This is a Bug, please report this!"); Iter::build(mom, increment) }, - _ => Err(KE::from_kind(KEK::ArgumentErrorNotAnAmount(self))), + _ => Err(Error::from(KEK::ArgumentErrorNotAnAmount(self))), } } @@ -355,7 +355,7 @@ pub mod extensions { assert!(increment.is_a_amount(), "This is a Bug, please report this!"); Iter::build(mom, increment) }, - _ => Err(KE::from_kind(KEK::ArgumentErrorNotAnAmount(self))), + _ => Err(Error::from(KEK::ArgumentErrorNotAnAmount(self))), } } @@ -371,7 +371,7 @@ pub mod extensions { assert!(increment.is_a_amount(), "This is a Bug, please report this!"); Iter::build(mom, increment) }, - _ => Err(KE::from_kind(KEK::ArgumentErrorNotAnAmount(self))), + _ => Err(Error::from(KEK::ArgumentErrorNotAnAmount(self))), } } @@ -386,7 +386,7 @@ pub mod extensions { assert!(increment.is_a_amount(), "This is a Bug, please report this!"); Iter::build(mom, increment) }, - _ => Err(KE::from_kind(KEK::ArgumentErrorNotAnAmount(self))), + _ => Err(Error::from(KEK::ArgumentErrorNotAnAmount(self))), } } @@ -401,7 +401,7 @@ pub mod extensions { assert!(increment.is_a_amount(), "This is a Bug, please report this!"); Iter::build(mom, increment) }, - _ => Err(KE::from_kind(KEK::ArgumentErrorNotAnAmount(self))), + _ => Err(Error::from(KEK::ArgumentErrorNotAnAmount(self))), } } @@ -412,7 +412,7 @@ pub mod extensions { fn every(self, inc: TT) -> Result<Iter> { match self { TT::Moment(mom) => Iter::build(mom, inc), - _ => Err(KE::from_kind(KEK::ArgumentErrorNotAnAmount(self))), + _ => Err(Error::from(KEK::ArgumentErrorNotAnAmount(self))), } } } |