Skip to content

Commit 485e523

Browse files
Merge upstream develop
2 parents b4f931a + 043d21f commit 485e523

3 files changed

Lines changed: 17 additions & 9 deletions

File tree

Cargo.lock

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,8 @@ getrandom = "0.4"
4040
thiserror = "2.0"
4141
chrono = { version = "0.4", features = ["serde"] }
4242
log = "0.4"
43-
time = "0.3"
43+
# Pinned: 0.3.48 adds a `From` impl on an associated-type projection that
44+
# fails coherence (E0119) in sea-query and aws-smithy-types. Unpin once those
45+
# crates ship releases that compile against it.
46+
time = "=0.3.47"
4447
base64 = "0.22.1"

services/common/object-store/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ polycentric-common.workspace = true
1010
# 3rd Party
1111
aws-config = { version = "1", features = ["behavior-version-latest"] }
1212
aws-sdk-s3 = "1"
13+
# Transitive pin: 0.60.21 makes DeferredSignerSender::send generic, which
14+
# breaks type inference in aws-runtime <=1.7.4 (E0282). Remove this pin when
15+
# the aws-sdk crates above are bumped to versions built against the new API.
16+
aws-smithy-eventstream = "=0.60.20"

0 commit comments

Comments
 (0)