Deuxfleurs/garage
45
52
Fork 67
Code Issues 92 Pull requests 9 Releases 29 Wiki Activity

Fix (Naive)DateTime warning on UTC conversion

Browse source
This commit is contained in:
Maximilien R. 2024-08-06 23:40:55 +02:00
parent 514c093501
commit babdb7bc2c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/model/s3/lifecycle_worker.rs
View file

@ -388,15 +388,14 @@ fn check_size_filter(version_data: &ObjectVersionData, filter: &LifecycleFilter)
fn midnight_ts(date: NaiveDate) -> u64 { fn midnight_ts(date: NaiveDate) -> u64 {
date.and_hms_opt(0, 0, 0) date.and_hms_opt(0, 0, 0)
.expect("midnight does not exist") .expect("midnight does not exist")
.and_utc()
.timestamp_millis() as u64 .timestamp_millis() as u64
} }
fn next_date(ts: u64) -> NaiveDate { fn next_date(ts: u64) -> NaiveDate {
NaiveDateTime::from_timestamp_millis(ts as i64) DateTime::from_timestamp_millis(ts as i64)
.expect("bad timestamp") .expect("bad timestamp")
.date() .date_naive()
.succ_opt()
.expect("no next day")
} }
fn today() -> NaiveDate { fn today() -> NaiveDate {