Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update quick-xml requirement from 0.26 to 0.27 #1101

Merged
merged 4 commits into from
Dec 26, 2022
Merged

chore(deps): update quick-xml requirement from 0.26 to 0.27 #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2aaec22
chore(deps): update quick-xml requirement from 0.26 to 0.27
dependabot[bot] Dec 26, 2022
1c267a1
Fix S3 test
Xuanwo Dec 26, 2022
7d58b05
Fix tests
Xuanwo Dec 26, 2022
1012979
Merge branch 'main' into dependabot/cargo/quick-xml-0.27
Xuanwo Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ parking_lot = "0.12"
percent-encoding = "2"
pin-project = "1"
prost = { version = "0.11", optional = true }
quick-xml = { version = "0.26", features = ["serialize", "overlapped-lists"] }
quick-xml = { version = "0.27", features = ["serialize", "overlapped-lists"] }
redis = { version = "0.22", features = [
"tokio-comp",
"connection-manager",
Expand Down
5 changes: 2 additions & 3 deletions src/services/azblob/dir_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ impl ObjectPage for DirStream {
};
self.next_marker = output.next_marker.clone().unwrap_or_default();

let prefixes = output.blobs.blob_prefix.unwrap_or_default();
let prefixes = output.blobs.blob_prefix;
let mut entries = Vec::with_capacity(prefixes.len() + output.blobs.blob.len());

for prefix in prefixes {
Expand Down Expand Up @@ -136,7 +136,7 @@ struct Output {
#[serde(default, rename_all = "PascalCase")]
struct Blobs {
blob: Vec<Blob>,
blob_prefix: Option<Vec<BlobPrefix>>,
blob_prefix: Vec<BlobPrefix>,
}

#[derive(Default, Debug, Deserialize)]
Expand Down Expand Up @@ -322,7 +322,6 @@ mod tests {
assert_eq!(
out.blobs
.blob_prefix
.unwrap()
.iter()
.map(|v| v.name.clone())
.collect::<Vec<String>>(),
Expand Down
5 changes: 2 additions & 3 deletions src/services/obs/dir_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl ObjectPage for DirStream {
};
self.next_marker = output.next_marker.clone().unwrap_or_default();

let common_prefixes = output.common_prefixes.unwrap_or_default();
let common_prefixes = output.common_prefixes;
let mut entries = Vec::with_capacity(common_prefixes.len() + output.contents.len());

for prefix in common_prefixes {
Expand Down Expand Up @@ -113,7 +113,7 @@ struct Output {
name: String,
prefix: String,
contents: Vec<Content>,
common_prefixes: Option<Vec<CommonPrefix>>,
common_prefixes: Vec<CommonPrefix>,
marker: String,
next_marker: Option<String>,
}
Expand Down Expand Up @@ -195,7 +195,6 @@ mod tests {
);
assert_eq!(
out.common_prefixes
.unwrap()
.iter()
.map(|v| v.prefix.clone())
.collect::<Vec<String>>(),
Expand Down
8 changes: 4 additions & 4 deletions src/services/s3/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ struct CompleteMultipartUploadRequest {
#[derive(Default, Debug, Serialize)]
#[serde(default, rename_all = "PascalCase")]
struct CompleteMultipartUploadRequestPart {
#[serde(rename = "$unflatten=PartNumber")]
#[serde(rename = "PartNumber")]
part_number: usize,
/// # TODO
///
Expand All @@ -1344,9 +1344,9 @@ struct CompleteMultipartUploadRequestPart {
/// #[derive(Default, Debug, Serialize)]
/// #[serde(default, rename_all = "PascalCase")]
/// struct CompleteMultipartUploadRequestPart {
/// #[serde(rename = "$unflatten=PartNumber")]
/// #[serde(rename = "PartNumber")]
/// part_number: usize,
/// #[serde(rename = "$unflatten=ETag", serialize_with = "partial_escape")]
/// #[serde(rename = "ETag", serialize_with = "partial_escape")]
/// etag: String,
/// }
///
Expand All @@ -1361,7 +1361,7 @@ struct CompleteMultipartUploadRequestPart {
/// ```
///
/// ref: <https://github.com/tafia/quick-xml/issues/362>
#[serde(rename = "$unflatten=ETag")]
#[serde(rename = "ETag")]
etag: String,
}

Expand Down