Update quick-xml to 0.27 (#3395)

* Update quick-xml * Fix Azure
apache · Dec 27, 2022 · 2444994 · 2444994
1 parent 733b7e7
commit 2444994
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml
@@ -44,7 +44,7 @@ walkdir = "2"
 
 # Cloud storage support
 base64 = { version = "0.20", default-features = false, features = ["std"], optional = true }
-quick-xml = { version = "0.26.0", features = ["serialize"], optional = true }
+quick-xml = { version = "0.27.0", features = ["serialize"], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
 serde_json = { version = "1.0", default-features = false, optional = true }
 rand = { version = "0.8", default-features = false, features = ["std", "std_rng"], optional = true }

diff --git a/object_store/src/aws/client.rs b/object_store/src/aws/client.rs
@@ -189,9 +189,9 @@ struct CompleteMultipart {
 
 #[derive(Debug, Serialize)]
 struct MultipartPart {
-    #[serde(rename = "$unflatten=ETag")]
+    #[serde(rename = "ETag")]
     e_tag: String,
-    #[serde(rename = "$unflatten=PartNumber")]
+    #[serde(rename = "PartNumber")]
     part_number: usize,
 }
 

diff --git a/object_store/src/azure/client.rs b/object_store/src/azure/client.rs
@@ -410,7 +410,6 @@ impl TryFrom<ListResultInternal> for ListResult {
         let common_prefixes = value
             .blobs
             .blob_prefix
-            .unwrap_or_default()
             .into_iter()
             .map(|x| Ok(Path::parse(x.name)?))
             .collect::<Result<_>>()?;
@@ -437,7 +436,8 @@ impl TryFrom<ListResultInternal> for ListResult {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 struct Blobs {
-    pub blob_prefix: Option<Vec<BlobPrefix>>,
+    #[serde(default)]
+    pub blob_prefix: Vec<BlobPrefix>,
     #[serde(rename = "Blob", default)]
     pub blobs: Vec<Blob>,
 }

diff --git a/object_store/src/gcp/mod.rs b/object_store/src/gcp/mod.rs
@@ -221,9 +221,9 @@ struct InitiateMultipartUploadResult {
 #[derive(serde::Serialize, Debug)]
 #[serde(rename_all = "PascalCase", rename(serialize = "Part"))]
 struct MultipartPart {
-    #[serde(rename = "$unflatten=PartNumber")]
+    #[serde(rename = "PartNumber")]
     part_number: usize,
-    #[serde(rename = "$unflatten=ETag")]
+    #[serde(rename = "ETag")]
     e_tag: String,
 }