Deuxfleurs/garage
44
56
Fork 74
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Updates dependencies for possible 1.1 release #847

Open
maximilien wants to merge 1 commit from update-dependencies-1.1 into main
pull from: update-dependencies-1.1
merge into: Deuxfleurs:main
Conversation 2 Commits 1 Files changed 5 +2198 -2069
5 changed files with 2198 additions and 2069 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1142
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

3109
Cargo.nix
View file

File diff suppressed because it is too large Load diff

8
Cargo.toml
View file

@ -137,9 +137,11 @@ assert-json-diff = "2.0"
rustc_version = "0.4.0"
static_init = "1.0"
aws-config = "1.1.4"
aws-sdk-config = "1.13"
aws-sdk-s3 = "1.14"
aws-config = "=1.1.4"
aws-credential-types = "=1.1.4"
aws-types = "=1.1.4"
aws-sdk-config = "=1.13.0"
aws-sdk-s3 = "=1.14.0"
[profile.dev]
#lto = "thin" # disabled for now, adds 2-4 min to each CI build

3
src/garage/Cargo.toml
View file

@ -63,7 +63,10 @@ syslog-tracing = { workspace = true, optional = true }
[dev-dependencies]
aws-config.workspace = true
aws-types.workspace = true
aws-credential-types.workspace = true
aws-sdk-s3.workspace = true
chrono.workspace = true
http.workspace = true
hmac.workspace = true

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

@ -388,13 +388,14 @@ fn check_size_filter(version_data: &ObjectVersionData, filter: &LifecycleFilter)
fn midnight_ts(date: NaiveDate) -> u64 {
date.and_hms_opt(0, 0, 0)
.expect("midnight does not exist")
.and_utc()
.timestamp_millis() as u64
}
fn next_date(ts: u64) -> NaiveDate {
NaiveDateTime::from_timestamp_millis(ts as i64)
DateTime::from_timestamp_millis(ts as i64)
.expect("bad timestamp")
.date()
.date_naive()
lx marked this conversation as resolved Outdated
lx commented 2024-08-24 11:14:57 +00:00
Outdated
Review
Copy link

By removing .succ_opt(), you are changing the meaning of this function! It is supposed to return the date of the day following the day of the given timestamp, not just the day of the timestamp.

By removing `.succ_opt()`, you are changing the meaning of this function! It is supposed to return the date of the day following the day of the given timestamp, not just the day of the timestamp.
.succ_opt()
.expect("no next day")
}