itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-10-02 07:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove check for DurationExceedsTimestamp

Browse Source 
This check is not necessary and prevented rounding and truncation
from working correctly on timestamps close to the Unix epoch.
This commit is contained in:
Georgi Krastev 2024-02-02 13:52:01 +01:00 committed by Paul Dicker
parent ef9a4c9539
commit c1f04222ca
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/round.rs
View File

@ -177,9 +177,6 @@ where
return Err(RoundingError::DurationExceedsLimit); return Err(RoundingError::DurationExceedsLimit);
} }
let stamp = naive.timestamp_nanos_opt().ok_or(RoundingError::TimestampExceedsLimit)?; let stamp = naive.timestamp_nanos_opt().ok_or(RoundingError::TimestampExceedsLimit)?;
if span > stamp.abs() {
return Err(RoundingError::DurationExceedsTimestamp);
}
if span == 0 { if span == 0 {
return Ok(original); return Ok(original);
} }
@ -216,9 +213,6 @@ where
return Err(RoundingError::DurationExceedsLimit); return Err(RoundingError::DurationExceedsLimit);
} }
let stamp = naive.timestamp_nanos_opt().ok_or(RoundingError::TimestampExceedsLimit)?; let stamp = naive.timestamp_nanos_opt().ok_or(RoundingError::TimestampExceedsLimit)?;
if span > stamp.abs() {
return Err(RoundingError::DurationExceedsTimestamp);
}
let delta_down = stamp % span; let delta_down = stamp % span;
match delta_down.cmp(&0) { match delta_down.cmp(&0) {
Ordering::Equal => Ok(original), Ordering::Equal => Ok(original),
@ -769,4 +763,26 @@ mod tests {
let span = TimeDelta::nanoseconds(-9_223_372_036_854_771_421); let span = TimeDelta::nanoseconds(-9_223_372_036_854_771_421);
assert_eq!(dt.duration_round(span), Err(RoundingError::DurationExceedsLimit)); assert_eq!(dt.duration_round(span), Err(RoundingError::DurationExceedsLimit));
} }
#[test]
fn test_duration_trunc_close_to_epoch() {
let dt = NaiveDate::from_ymd_opt(1970, 1, 1).unwrap().and_hms_opt(0, 0, 15).unwrap();
let span = Duration::minutes(15);
assert_eq!(dt.duration_trunc(span).unwrap().to_string(), "1970-01-01 00:00:00");
let dt = NaiveDate::from_ymd_opt(1969, 12, 31).unwrap().and_hms_opt(23, 59, 45).unwrap();
let span = Duration::minutes(15);
assert_eq!(dt.duration_trunc(span).unwrap().to_string(), "1969-12-31 23:45:00");
}
#[test]
fn test_duration_round_close_to_epoch() {
let dt = NaiveDate::from_ymd_opt(1970, 1, 1).unwrap().and_hms_opt(0, 0, 15).unwrap();
let span = Duration::minutes(15);
assert_eq!(dt.duration_round(span).unwrap().to_string(), "1970-01-01 00:00:00");
let dt = NaiveDate::from_ymd_opt(1969, 12, 31).unwrap().and_hms_opt(23, 59, 45).unwrap();
let span = Duration::minutes(15);
assert_eq!(dt.duration_round(span).unwrap().to_string(), "1970-01-01 00:00:00");
}
} }