584a31c · helix · git.iko.soy

on master help sign in

Used checked_add for years and months

584a31cJason Rodney Hansen5 years ago

helix-core/src/increment/date_time.rs+2−2

@@ -340,7 +340,7 @@ fn ndays_in_month(year: i32, month: u32) -> u32 {

340}

341

342fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {

343− let month = date_time.month0() as i64 + amount;

343+ let month = (date_time.month0() as i64).checked_add(amount)?;

344 let year = date_time.year() + i32::try_from(month / 12).ok()?;

345 let year = if month.is_negative() { year - 1 } else { year };

346

@@ -359,7 +359,7 @@ fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {

359}

360

361fn add_years(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {

362− let year = i32::try_from(date_time.year() as i64 + amount).ok()?;

362+ let year = i32::try_from((date_time.year() as i64).checked_add(amount)?).ok()?;

363 let ndays = ndays_in_month(year, date_time.month());

364

365 if date_time.day() > ndays {