From c22b176154623e5bfde73937293da629c26ab264 Mon Sep 17 00:00:00 2001 From: Negezor Date: Wed, 26 Feb 2025 23:14:11 +1100 Subject: [PATCH 1/2] chore(deps): update dependencies --- aws-creds/Cargo.toml | 6 +++--- aws-region/Cargo.toml | 2 +- s3/Cargo.toml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aws-creds/Cargo.toml b/aws-creds/Cargo.toml index 2d88d3d4ba..722a1a205c 100644 --- a/aws-creds/Cargo.toml +++ b/aws-creds/Cargo.toml @@ -15,14 +15,14 @@ name = "awscreds" path = "src/lib.rs" [dependencies] -thiserror = "1" +thiserror = "2" home = "0.5" rust-ini = "0.21" -attohttpc = { version = "0.28", default-features = false, features = [ +attohttpc = { version = "0.29", default-features = false, features = [ "json", ], optional = true } url = "2" -quick-xml = { version = "0.32", features = ["serialize"] } +quick-xml = { version = "0.37", features = ["serialize"] } serde = { version = "1", features = ["derive"] } time = { version = "^0.3.6", features = ["serde", "serde-well-known"] } log = "0.4" diff --git a/aws-region/Cargo.toml b/aws-region/Cargo.toml index a6b0ef864a..f95d23e3db 100644 --- a/aws-region/Cargo.toml +++ b/aws-region/Cargo.toml @@ -15,5 +15,5 @@ name = "awsregion" path = "src/lib.rs" [dependencies] -thiserror = "1" +thiserror = "2" serde = { version = "1", features = ["derive"], optional = true } diff --git a/s3/Cargo.toml b/s3/Cargo.toml index 5d0576c7ba..3389d549c0 100644 --- a/s3/Cargo.toml +++ b/s3/Cargo.toml @@ -42,16 +42,16 @@ path = "../examples/gcs-tokio.rs" [dependencies] async-std = { version = "1", optional = true } async-trait = "0.1" -attohttpc = { version = "0.28", optional = true, default-features = false } +attohttpc = { version = "0.29", optional = true, default-features = false } # aws-creds = { version = "*", path = "../aws-creds", default-features = false } aws-creds = { version = "0.38", default-features = false } # aws-region = { version = "*", path = "../aws-region" } aws-region = "0.27" base64 = "0.22" block_on_proc = { version = "0.2", optional = true } -bytes = { version = "1.2" } +bytes = { version = "1.10" } cfg-if = "1" -futures = { version = "0.3", optional = true, default-features = false } +futures = { version = "0.3", optional = true, default-features = false, features = ["alloc"] } hex = "0.4" hmac = "0.12" http = "1" @@ -60,7 +60,7 @@ maybe-async = { version = "0.2" } md5 = "0.7" minidom = { version = "0.16", optional = true } percent-encoding = "2" -quick-xml = { version = "0.36", features = ["serialize"] } +quick-xml = { version = "0.37", features = ["serialize"] } reqwest = { version = "0.12", optional = true, features = [ "stream", ], default-features = false } @@ -69,7 +69,7 @@ serde_derive = "1" serde_json = "1" sha2 = "0.10" surf = { version = "2", optional = true, default-features = false } -thiserror = { version = "1", default-features = false } +thiserror = { version = "2", default-features = false } time = { version = "^0.3.6", features = [ "formatting", "macros", From 2801270211dab4b6ca3504e23c85d66902001d89 Mon Sep 17 00:00:00 2001 From: Negezor Date: Wed, 26 Feb 2025 23:14:17 +1100 Subject: [PATCH 2/2] fix(s3): add support xml serialize error --- s3/src/error.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/s3/src/error.rs b/s3/src/error.rs index 8e8e87f403..d099a8e87f 100644 --- a/s3/src/error.rs +++ b/s3/src/error.rs @@ -36,7 +36,9 @@ pub enum S3Error { #[error("from utf8: {0}")] FromUtf8(#[from] std::string::FromUtf8Error), #[error("serde xml: {0}")] - SerdeXml(#[from] quick_xml::de::DeError), + SerdeDeXml(#[from] quick_xml::de::DeError), + #[error("serde xml: {0}")] + SerdeSeXml(#[from] quick_xml::se::SeError), #[error("invalid header value: {0}")] InvalidHeaderValue(#[from] http::header::InvalidHeaderValue), #[cfg(feature = "with-async-std")]