update Cargo dependencies

Some aws-* crates have been pinned because newer versions don't compile
with rustc 1.73. These crates are only used for integration testing, no
crates which are part of the final Garage version are concerned.
This commit is contained in:
Alex Auvolat 2024-08-25 11:19:38 +02:00
parent 8d62616ec0
commit f3589fee77
No known key found for this signature in database
GPG key ID: 0E496D15096376BE
5 changed files with 2198 additions and 2069 deletions

1142
Cargo.lock generated

File diff suppressed because it is too large Load diff

3109
Cargo.nix

File diff suppressed because it is too large Load diff

View file

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

View file

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

View file

@ -388,13 +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() .succ_opt()
.expect("no next day") .expect("no next day")
} }