From e682ef13c26a205264607badf5c6a2916819bcee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 10:19:51 +0000 Subject: [PATCH 1/2] Bump quick-xml from 0.30.0 to 0.31.0 Bumps [quick-xml](https://github.com/tafia/quick-xml) from 0.30.0 to 0.31.0. - [Release notes](https://github.com/tafia/quick-xml/releases) - [Changelog](https://github.com/tafia/quick-xml/blob/master/Changelog.md) - [Commits](https://github.com/tafia/quick-xml/compare/v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: quick-xml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- server/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ca2af8..ab42905 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1533,9 +1533,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] diff --git a/server/Cargo.toml b/server/Cargo.toml index eeaee2a..6fda3dc 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -21,7 +21,7 @@ itoa = "1.0.6" libgssapi = { version = "0.6.4", features = ["iov"] } log = "0.4.19" mime = "0.3.17" -quick-xml = "0.30.0" +quick-xml = "0.31.0" roxmltree = "0.18.0" tokio = { version = "1.33.0", features = ["full"] } rdkafka = { version = "0.34.0", features = ["zstd", "libz", "external-lz4"] } From 54b52abe6be62eebaba1bea28edb09ebfb79db2f Mon Sep 17 00:00:00 2001 From: Vincent Ruello <5345986+vruello@users.noreply.github.com> Date: Wed, 25 Oct 2023 12:46:05 +0200 Subject: [PATCH 2/2] Explicit typing of quick_xml closures results --- server/src/soap.rs | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/server/src/soap.rs b/server/src/soap.rs index 7d8311e..830da56 100644 --- a/server/src/soap.rs +++ b/server/src/soap.rs @@ -72,9 +72,9 @@ impl Serializable for Subscription { .write_inner_content(|writer| { self.header.serialize(writer)?; self.body.serialize(writer)?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; Ok(()) } @@ -115,9 +115,9 @@ impl Serializable for SubscriptionBody { writer .create_element("e:Identifier") .write_text_content(BytesText::new(&self.identifier))?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; writer .create_element("e:Delivery") @@ -141,7 +141,7 @@ impl Serializable for SubscriptionBody { .write_text_content(BytesText::new( &self.identifier, ))?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; writer .create_element("c:Policy") @@ -182,11 +182,11 @@ impl Serializable for SubscriptionBody { .write_text_content(BytesText::new( tmb, ))?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) // ----- END TLS ----- // } else { @@ -200,15 +200,15 @@ impl Serializable for SubscriptionBody { SPNEGO_KERBEROS, )) .write_empty()?; - Ok(()) + Ok::<(), quick_xml::Error>(()) // ----- END KRB ----- // } })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) }, )?; writer @@ -242,7 +242,7 @@ impl Serializable for SubscriptionBody { writer .create_element("w:ContentEncoding") .write_text_content(BytesText::new("UTF-16"))?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; writer .create_element("w:Filter") @@ -258,7 +258,7 @@ impl Serializable for SubscriptionBody { _ => (), }; } - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; if let Some(bookmark) = &self.bookmark { writer @@ -273,13 +273,13 @@ impl Serializable for SubscriptionBody { _ => (), }; } - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; } writer.create_element("w:SendBookmarks").write_empty()?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; Ok(()) } @@ -405,7 +405,7 @@ impl Serializable for Header { .create_element("a:Address") .with_attribute(("s:mustUnderstand", "true")) .write_text_content(BytesText::new(reply_to))?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; } if let Some(action) = &self.action { @@ -476,10 +476,10 @@ impl Serializable for Header { .write_empty()?, }; } - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; } - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; Ok(()) } @@ -510,12 +510,12 @@ impl Serializable for Body { for subscription in subscriptions { subscription.serialize(writer)?; } - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; writer.create_element("w:EndOfSequence").write_empty()?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; } x => { @@ -555,7 +555,7 @@ impl Serializable for Message { writer.create_element("s:Body").write_empty()?; } } - Ok(()) + Ok::<(), quick_xml::Error>(()) })?; Ok(()) }