diff --git a/rust-toolchain b/rust-toolchain index d2d6255..7cc6ef4 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.51.0 \ No newline at end of file +1.63.0 \ No newline at end of file diff --git a/saffron/src/describe/english.rs b/saffron/src/describe/english.rs index b641e36..ea6a575 100644 --- a/saffron/src/describe/english.rs +++ b/saffron/src/describe/english.rs @@ -87,7 +87,7 @@ impl English { ), }) } - fn hour<'a>(&'a self, h: OrsExpr) -> impl Display + 'a { + fn hour(&self, h: OrsExpr) -> impl Display + '_ { display(move |f| match h { OrsExpr::One(hour) => write!( f, diff --git a/saffron/src/lib.rs b/saffron/src/lib.rs index afeae71..c41df41 100644 --- a/saffron/src/lib.rs +++ b/saffron/src/lib.rs @@ -1078,14 +1078,14 @@ impl Cron { } let front = match bounds.start_bound() { - Bound::Unbounded => Some(chrono::MIN_DATETIME), + Bound::Unbounded => Some(DateTime::::MIN_UTC), Bound::Included(start) => Some(*start), Bound::Excluded(start) => next_minute(*start), } .map(minute_floor); let back = match bounds.end_bound() { - Bound::Unbounded => Some(chrono::MAX_DATETIME), + Bound::Unbounded => Some(DateTime::::MAX_UTC), Bound::Included(end) => Some(*end), Bound::Excluded(end) => previous_minute(*end), } @@ -1113,7 +1113,7 @@ impl Cron { pub fn next_from(&self, start: DateTime) -> Option> { let start = minute_floor(start); if self.any() { - self.find_next(start, chrono::MAX_DATETIME) + self.find_next(start, DateTime::::MAX_UTC) } else { None } @@ -1134,7 +1134,7 @@ impl Cron { pub fn next_after(&self, start: DateTime) -> Option> { let start = next_minute(minute_floor(start))?; if self.any() { - self.find_next(start, chrono::MAX_DATETIME) + self.find_next(start, DateTime::::MAX_UTC) } else { None } @@ -1935,7 +1935,7 @@ mod tests { let results = cron.iter((start, end)).collect::>(); let times = times - .into_iter() + .iter() .map(|&time| { Utc.datetime_from_str(time, FORMAT) .expect("Failed to parse expected date") @@ -1994,7 +1994,7 @@ mod tests { assert( "* * * * *", ( - Bound::Excluded(&chrono::MAX_DATETIME.format(FORMAT).to_string().as_str()), + Bound::Excluded(&DateTime::::MAX_UTC.format(FORMAT).to_string().as_str()), Bound::Unbounded, ), &[], @@ -2007,7 +2007,7 @@ mod tests { "* * * * *", ( Bound::Unbounded, - Bound::Excluded(chrono::MIN_DATETIME.format(FORMAT).to_string().as_str()), + Bound::Excluded(DateTime::::MIN_UTC.format(FORMAT).to_string().as_str()), ), &[], ) diff --git a/saffron/src/parse.rs b/saffron/src/parse.rs index 48a865d..730b6c1 100644 --- a/saffron/src/parse.rs +++ b/saffron/src/parse.rs @@ -161,7 +161,7 @@ impl TryFrom for DayOfMonth { #[inline] fn try_from(value: u8) -> Result { - if value >= Self::MIN && value <= Self::MAX { + if (Self::MIN..=Self::MAX).contains(&value) { Ok(Self(value)) } else { Err(ValueOutOfRangeError) @@ -201,7 +201,7 @@ impl TryFrom for DayOfMonthOffset { #[inline] fn try_from(value: u8) -> Result { - if value >= Self::MIN && value <= Self::MAX { + if (Self::MIN..=Self::MAX).contains(&value) { Ok(Self(value)) } else { Err(ValueOutOfRangeError) @@ -281,7 +281,7 @@ impl TryFrom for Month { #[inline] fn try_from(value: u8) -> Result { - if value >= Self::MIN && value <= Self::MAX { + if (Self::MIN..=Self::MAX).contains(&value) { Ok(Self(value)) } else { Err(ValueOutOfRangeError) @@ -321,7 +321,7 @@ impl TryFrom for NthDay { #[inline] fn try_from(value: u8) -> Result { - if value >= Self::MIN && value <= Self::MAX { + if (Self::MIN..=Self::MAX).contains(&value) { Ok(Self(value)) } else { Err(ValueOutOfRangeError) @@ -717,11 +717,7 @@ where } /// Consumes a set of trailing ORS expressions -fn tail_ors_exprs<'a, E, F>( - mut input: &'a str, - f: F, - mut exprs: Exprs, -) -> IResult<&'a str, Exprs> +fn tail_ors_exprs(mut input: &str, f: F, mut exprs: Exprs) -> IResult<&str, Exprs> where E: ExprValue + TryFrom + Ord + Copy, F: Fn(&str) -> IResult<&str, E>, @@ -747,7 +743,6 @@ where F: Fn(&str) -> IResult<&str, E>, { move |mut input: &str| { - let expressions: Exprs; // Attempt to read a `*`. If that succeeds, // try to read a `/` for a step expr. // If this isn't a step expr, return Expr::All, @@ -755,7 +750,7 @@ where // list with an ors_expr. let star = opt(char('*'))(input)?; input = star.0; - if star.1.is_some() { + let expressions = if star.1.is_some() { let slash = opt(char('/'))(input)?; input = slash.0; // If there is no slash after this, just return All and expect the next @@ -765,7 +760,7 @@ where } let step = step_digit::()(input)?; input = step.0; - expressions = Exprs::new(OrsExpr::Step { + Exprs::new(OrsExpr::Step { start: ExprValue::min(), end: ExprValue::max(), step: step.1, @@ -773,8 +768,8 @@ where } else { let expr = ors_expr::(&f)(input)?; input = expr.0; - expressions = Exprs::new(expr.1) - } + Exprs::new(expr.1) + }; let (input, exprs) = tail_ors_exprs(input, &f, expressions)?;